diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/static/gitiles.css b/gitiles-servlet/src/main/resources/com/google/gitiles/static/gitiles.css
index 23cefad..7987894 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/static/gitiles.css
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/static/gitiles.css
@@ -82,16 +82,32 @@
   padding-left: 1em;
   white-space: nowrap;
 }
+
+.formats {
+  text-align: right;
+  background: clear;
+  padding-right: 1em;
+  width: 90%;
+  clear: both;
+}
+
+.formats a {
+  color: black;
+  font-weight: bold;
+  font-size: 70%;
+}
+
 .footer {
   text-align: right;
   background: #eee;
   padding-right: 1em;
   width: 90%;
+  clear: both;
 }
+
 .footer a {
   color: black;
-  font-weight: bold;
-  font-size: 70%;
+  font-style: italic;
 }
 
 
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy
index 908f2fd..06db9a3 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy
@@ -90,6 +90,9 @@
  * Standard footer.
  */
 {template .footer}
+  <div class="footer">
+      Powered by <a href="https://code.google.com/p/gitiles/">Gitiles</a>
+  </div>
 </body>
 </html>
 {/template}
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/DefaultCustomTemplates.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/DefaultCustomTemplates.soy
index a1f5d9e..b952d3c 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/DefaultCustomTemplates.soy
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/DefaultCustomTemplates.soy
@@ -17,5 +17,5 @@
  * Default custom header implementation for Gitiles.
  */
 {template .customHeader}
-<h1>{msg desc="short name of the application"}Gitiles{/msg}</h1>
+<h1>{msg desc="short name of the application"}{gitiles.SITE_TITLE}{/msg}</h1>
 {/template}
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/HostIndex.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/HostIndex.soy
index 1ee9616..cf3e726 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/HostIndex.soy
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/HostIndex.soy
@@ -67,7 +67,7 @@
       </tr>
     {/foreach}
   </table>
-  <div class="footer">
+  <div class="formats">
     <a href="?format=TEXT">{msg desc="text format"}TXT{/msg}</a>
     {sp}
     <a href="?format=JSON">{msg desc="JSON format"}JSON{/msg}</a>