diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
index 75b33c4ce..4e6719eec 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
@@ -28,7 +28,13 @@
 <h1>Administration</h1>
 
 <div id="contentArea">
-<h2>Configuration</h2>
+<div>
+  <div style="float: right">
+    <%-- TODO replace with icons --%>
+    <a href="<ww:url action="configure" />">Edit Configuration</a>
+  </div>
+  <h2>Configuration</h2>
+</div>
 
 <table class="infoTable">
   <tr>
@@ -75,11 +81,12 @@
   </table>
 </c:if>
 
-<p>
-  <a href="<ww:url action="configure" />">Edit Configuration</a>
-</p>
-
-<h2>Managed Repositories</h2>
+<div>
+  <div style="float: right">
+    <%-- TODO replace with icons --%>
+    <a href="<ww:url action="addRepository" method="input" />">Add Repository</a></div>
+  <h2>Managed Repositories</h2>
+</div>
 
 <ww:set name="repositories" value="repositories"/>
 <c:if test="${empty(repositories)}">
@@ -131,10 +138,6 @@
     </table>
   </div>
 </c:forEach>
-
-<p>
-  <a href="<ww:url action="addRepository" method="input" />">Add Repository</a>
-</p>
 </div>
 
 </body>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
index 0c562cadc..de70d8c34 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
@@ -29,7 +29,13 @@
 <h1>Administration</h1>
 
 <div id="contentArea">
-  <h2>Proxied Repositories</h2>
+  <div>
+    <%-- TODO replace with icons --%>
+    <div style="float: right">
+      <a href="<ww:url action="addProxiedRepository" method="input" />">Add Repository</a>
+    </div>
+    <h2>Proxied Repositories</h2>
+  </div>
 
   <ww:set name="proxiedRepositories" value="proxiedRepositories"/>
   <c:if test="${empty(proxiedRepositories)}">
@@ -105,10 +111,6 @@
       </table>
     </div>
   </c:forEach>
-
-  <p>
-    <a href="<ww:url action="addProxiedRepository" method="input" />">Add Repository</a>
-  </p>
 </div>
 
 </body>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
index f36de4925..7384b14b8 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
@@ -28,7 +28,13 @@
 <h1>Administration</h1>
 
 <div id="contentArea">
-<h2>Synced Repositories</h2>
+<div>
+  <%-- TODO replace with icons --%>
+  <div style="float: right">
+    <a href="<ww:url action="addSyncedRepository" method="input" />">Add Repository</a>
+  </div>
+  <h2>Synced Repositories</h2>
+</div>
 
 <ww:set name="syncedRepositories" value="syncedRepositories"/>
 <c:if test="${empty(syncedRepositories)}">
@@ -135,10 +141,6 @@
     </table>
   </div>
 </c:forEach>
-
-<p>
-  <a href="<ww:url action="addSyncedRepository" method="input" />">Add Repository</a>
-</p>
 </div>
 
 </body>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
index 8e7ba5f8a..ce9d5eabf 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
@@ -69,9 +69,18 @@
 </h1>
 
 <div class="sidebar3">
-  <%-- TODO! download URL
-  <div id="download"><a href="#">Download</a></div>
-  --%>
+  <div id="download">
+    <c:set var="url">
+      <ww:url action="proxy">
+        <%-- TODO! create a tag for this, include classifier for javadoc, sources below --%>
+        <%-- TODO: what about other repositories? --%>
+        <%-- TODO! extension probably doesn't match type --%>
+        <ww:param name="path"
+                  value="%{'${model.groupId}/${model.artifactId}/${model.version}/${model.artifactId}-${model.version}.${model.packaging}'}"/>
+      </ww:url>
+    </c:set>
+    <a href="${url}">Download</a>
+  </div>
 </div>
 
 <div id="contentArea">
diff --git a/archiva-webapp/src/main/webapp/css/maven-theme.css b/archiva-webapp/src/main/webapp/css/maven-theme.css
index 61393d800..b52a561b0 100644
--- a/archiva-webapp/src/main/webapp/css/maven-theme.css
+++ b/archiva-webapp/src/main/webapp/css/maven-theme.css
@@ -30,6 +30,7 @@ select, input {
 th {
     text-align: right;
     padding-right: 1em;
+    font-size: x-small;
 }
 
 .infoTable th {
@@ -42,16 +43,16 @@ th {
     background-position: left bottom;
     border-bottom: 1px solid #DFDEDE;
     padding: 0 0 1px 23px;
-    margin-bottom: 7px;
+    margin-bottom: 0.5em;
     color: #333;
     voice-family: inherit;
-    font-size: small !important;
+    font-size: medium !important;
 }
 
 #contentBox h2 {
     border-bottom: 1px solid #DFDEDE;
     padding: 0 0 1px 0;
-    margin-bottom: 7px;
+    margin-bottom: 0.5em;
     color: #333;
     voice-family: inherit;
     font-size: small !important;
@@ -60,10 +61,11 @@ th {
 #contentBox h3 {
     border-bottom: 1px solid #DFDEDE;
     padding: 0 0 1px 0;
-    margin-bottom: 7px;
+    margin-bottom: 0.5em;
     color: #333;
     voice-family: inherit;
     font-size: small !important;
+    margin-left: 2em;
 }
 
 table {