diff --git a/CHANGES.txt b/CHANGES.txt
index 6bc4f64c92e..50fd8541558 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -153,6 +153,7 @@ Other Changes
  8. check solr return code in admin scripts, SOLR-62
  9. Updated to Lucene 2.0 nightly build 2006-11-15, SVN revision 475069
 10. Removed src/apps containing the legacy "SolrTest" app (hossman, SOLR-3)
+11. Simplified index.jsp and form.jsp, primarily by removing/hiding XML
+    specific params, and adding an option to pick the output type. (hossman)
 
- 
 2006/01/17 Solr open sourced, moves to Apache Incubator
diff --git a/src/webapp/resources/admin/form.jsp b/src/webapp/resources/admin/form.jsp
index b60669c8213..c6c612c0d7e 100644
--- a/src/webapp/resources/admin/form.jsp
+++ b/src/webapp/resources/admin/form.jsp
@@ -18,24 +18,22 @@
 <%@include file="header.jsp" %>
 
 <br clear="all">
-<h2>/select mode</h2>
+<form name="queryForm" method="GET" action="../select">
+
+<!-- these are good defaults to have if people bookmark the resulting
+     URLs, but they should not show up in the form since they are very
+     output type specific.
+  -->
+<input name="indent" type="hidden" value="on">
+<input name="version" type="hidden" value="2.1">
 
-<form name=queryForm method="GET" action="../select">
 <table>
 <tr>
   <td>
 	<strong>Solr/Lucene Statement</strong>
   </td>
   <td>
-	<textarea rows="5" cols="60" name="q"></textarea>
-  </td>
-</tr>
-<tr>
-  <td>
-	<strong>Protocol Version</strong>
-  </td>
-  <td>
-	<input name="version" type="text" value="2.1">
+	<textarea rows="5" cols="60" name="q"><%= defaultSearch %></textarea>
   </td>
 </tr>
 <tr>
@@ -59,7 +57,7 @@
 	<strong>Fields to Return</strong>
   </td>
   <td>
-	<input name="fl" type="text" value="">
+	<input name="fl" type="text" value="*,score">
   </td>
 </tr>
 <tr>
@@ -72,18 +70,10 @@
 </tr>
 <tr>
   <td>
-	<strong>Style Sheet</strong>
+	<strong>Output Type</strong>
   </td>
   <td>
-	<input name="stylesheet" type="text" value="">
-  </td>
-</tr>
-<tr>
-  <td>
-	<strong>Indent XML</strong>
-  </td>
-  <td>
-	<input name="indent" type="checkbox" checked="true">
+	<input name="wt" type="text" value="standard">
   </td>
 </tr>
 <tr>
@@ -92,7 +82,7 @@
   </td>
   <td>
 	<input name="debugQuery" type="checkbox" >
-  <em><font size="-1">  Note: do "view source" in your browser to see explain() correctly indented</font></em>
+  <em><font size="-1">  Note: you may need to "view source" in your browser to see explain() correctly indented.</font></em>
   </td>
 </tr>
 <tr>
@@ -101,7 +91,7 @@
   </td>
   <td>
 	<input name="explainOther" type="text" >
-  <em><font size="-1">  apply original query scoring to matches of this query</font></em>
+  <em><font size="-1">  Apply original query scoring to matches of this query to see how they compare.</font></em>
   </td>
 </tr>
 <tr>
@@ -129,7 +119,12 @@
 </tr>
 </table>
 </form>
-
+<br clear="all">
+<em>
+This form demonstrates the most common query options available for the
+built in Query Types.  Please consult the Solr Wiki for additional
+Query Parameters.
+</em>
 
 </body>
 </html>
diff --git a/src/webapp/resources/admin/index.jsp b/src/webapp/resources/admin/index.jsp
index 5a249a3a1c5..b6b7276c7cb 100644
--- a/src/webapp/resources/admin/index.jsp
+++ b/src/webapp/resources/admin/index.jsp
@@ -69,18 +69,6 @@
   </td>
 </tr>
 
-<!-- TODO: make it possible to add links to the admin page via solrconfig.xml
-<tr>
-  <td>
-	<strong>Hardware:</strong><br>
-  </td>
-  <td>
-	[<a href="http://playground.cnet.com/db/machines-match.php3?searchterm=<%= hostname %>&searchfield=hostorserial">Status</a>]
-	[<a href="http://playground.cnet.com/db/machines-match.php3?searchterm=<%= hostname %>/t&searchfield=hostorserial">Traffic</a>]
-	[<a href="http://monitor.cnet.com/orca_mon/?mgroup=prob&hours=48&hostname=<%= hostname %>">Problems</a>]
-  </td>
-</tr>
--->
 <jsp:include page="get-file.jsp?file=admin-extra.html&optional=y" flush="true"/>
 
 </table><P>
@@ -92,18 +80,16 @@
 	<h3>Make a Query</h3>
   </td>
   <td>
-
-  <td>
-	[<a href="form.jsp">Full Interface</a>]
+[<a href="form.jsp">Full Interface</a>]
   </td>
+  
 </tr>
 <tr>
   <td>
-  StyleSheet:<br>Query:
+  Query String:
   </td>
   <td colspan=2>
 	<form name=queryForm method="GET" action="../select/">
-        <input class="std" name="stylesheet" type="text" value=""><br>
         <textarea class="std" rows="4" cols="40" name="q"><%= defaultSearch %></textarea>
         <input name="version" type="hidden" value="2.1">
 	<input name="start" type="hidden" value="0">