diff --git a/design/white-site/src/site/xdoc/admin/config.xml b/design/white-site/src/site/xdoc/admin/config.xml
index d4caa5268..09bcc9e99 100644
--- a/design/white-site/src/site/xdoc/admin/config.xml
+++ b/design/white-site/src/site/xdoc/admin/config.xml
@@ -7,7 +7,7 @@
 
     <div id="contentArea">
       <div id="searchBox">
-        <form method="post" action="saveConfiguration" namespace="/admin" validate="true">
+        <form method="post" action="index.html">
           <p>
             Repository Directory:
             <input type="text" size="100"/>
diff --git a/design/white-site/src/site/xdoc/admin/index.xml b/design/white-site/src/site/xdoc/admin/index.xml
index ea92dd522..26cd6a3d4 100644
--- a/design/white-site/src/site/xdoc/admin/index.xml
+++ b/design/white-site/src/site/xdoc/admin/index.xml
@@ -6,6 +6,29 @@
     <h1>Administration</h1>
 
     <div id="contentArea">
+      <h2>Configuration</h2>
+
+      <table>
+        <tr>
+          <th>Repository Directory</th>
+          <td>...</td>
+          <td></td>
+        </tr>
+        <tr>
+          <th>Indexing Schedule</th>
+          <td>...</td>
+          <td>
+            <a href="#">Run Now</a>
+          </td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td>
+            <a href="config.html">Edit Configuration</a>
+          </td>
+        </tr>
+      </table>
     </div>
     <div id="notes">
       <p>Notes</p>
diff --git a/maven-repository-webapp/src/main/resources/xwork.xml b/maven-repository-webapp/src/main/resources/xwork.xml
index 5eb700abe..e10c4e8ea 100644
--- a/maven-repository-webapp/src/main/resources/xwork.xml
+++ b/maven-repository-webapp/src/main/resources/xwork.xml
@@ -62,10 +62,6 @@
       <result name="proxyError" type="dispatcher">proxyError</result>
     </action>
 
-    <action name="search" class="org.apache.maven.repository.manager.web.action.PackageSearchAction">
-      <result name="success" type="dispatcher">/WEB-INF/jsp/results.jsp</result>
-    </action>
-
     <action name="browse" class="org.apache.maven.repository.manager.web.action.RepositoryBrowseAction">
       <result name="success" type="dispatcher">/WEB-INF/jsp/browse.jsp</result>
       <result name="error" type="dispatcher">/WEB-INF/jsp/browse.jsp</result>
@@ -77,17 +73,21 @@
   <package name="admin" namespace="/admin" extends="webwork-default">
     <default-interceptor-ref name="defaultStack"/>
 
+    <action name="index" class="configureAction" method="input">
+      <result name="input">/WEB-INF/jsp/admin/index.jsp</result>
+    </action>
+
     <action name="configure" class="configureAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/configure.jsp</result>
     </action>
 
     <action name="saveConfiguration" class="configureAction">
       <result name="input">/WEB-INF/jsp/admin/configure.jsp</result>
-      <result>/WEB-INF/jsp/admin/configure.jsp</result>
+      <result>/WEB-INF/jsp/admin/index.jsp</result>
     </action>
 
     <action name="runIndexer" class="runIndexerAction">
-      <!-- TODO: back to page where this comes from! -->
+      <result type="redirect">/admin/index.action</result>
     </action>
   </package>
 </xwork>
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
index 8f70c1194..557aea9e8 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
+++ b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
@@ -1,4 +1,3 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
 <%--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -15,6 +14,8 @@
   ~ limitations under the License.
   --%>
 
+<%@ taglib prefix="ww" uri="/webwork" %>
+
 <html>
 <head>
   <title>Configuration</title>
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
new file mode 100644
index 000000000..3501bd352
--- /dev/null
+++ b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
@@ -0,0 +1,51 @@
+<%--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  --%>
+
+<%@ taglib prefix="ww" uri="/webwork" %>
+
+<html>
+<head>
+  <title>Administration</title>
+  <ww:head />
+</head>
+
+<body>
+
+<h1>Administration</h1>
+
+<div id="contentArea">
+  <h2>Configuration</h2>
+  <table>
+    <tr>
+      <th>Repository Directory</th>
+      <td><ww:property value="repositoryDirectory" /></td>
+      <td></td>
+    </tr>
+    <tr>
+      <th>Indexing Schedule</th>
+      <td><ww:property value="indexerCronExpression" /></td>
+      <td><a href="<ww:url action="runIndexer" />">Run Now</a></td>
+    </tr>
+    <tr>
+      <td><a href="<ww:url action="configure" />">Edit Configuration</a></td>
+      <td></td>
+      <td></td>
+    </tr>
+  </table>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 18871c9b4..581178ce9 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -95,7 +95,7 @@
       --%>
 
       <li class="expanded">
-        <a href="#">Administration</a>
+        <my:currentWWUrl action="index" namespace="/admin">Administration</my:currentWWUrl>
         <ul>
           <li class="none">
             <my:currentWWUrl action="configure" namespace="/admin">Configuration</my:currentWWUrl>
@@ -104,7 +104,7 @@
       </li>
     </ul>
 
-
+    <br />
   </div>
 </div>
 

Repository Directory	...
Indexing Schedule	...	+ Run Now +
		+ Edit Configuration +
Repository Directory
Indexing Schedule		">Run Now
">Edit Configuration