diff --git a/progit/static/images/profile_button.png b/progit/static/images/profile_button.png
new file mode 100644
index 0000000..461990c
Binary files /dev/null and b/progit/static/images/profile_button.png differ
diff --git a/progit/static/images/profile_button_hover.png b/progit/static/images/profile_button_hover.png
new file mode 100644
index 0000000..73bb7ed
Binary files /dev/null and b/progit/static/images/profile_button_hover.png differ
diff --git a/progit/static/progit.css b/progit/static/progit.css
index e7d64a4..1c8568c 100644
--- a/progit/static/progit.css
+++ b/progit/static/progit.css
@@ -47,6 +47,7 @@ table.list thead th,
 .project_list > header,
 [id=fork_button]:hover,
 [id=settings_button]:hover,
+[id=profile_button]:hover,
 .fgradient{
     color: white;
     background: #426ead; /* Old browsers */
@@ -77,7 +78,8 @@ div.horizontal-menu li {
     height: 100%;
 }
 
-div.horizontal-menu a {
+div.horizontal-menu a,
+#profile_button a {
     color: #4D4D4D;
     display: block;
     font-size: 1.1em;
@@ -544,12 +546,13 @@ a.user_settings {
     float: right;
 }
 
-#fork_button, #settings_button {
+#fork_button, #settings_button, #profile_button {
     border-radius: 10px;
 }
 
 #fork_button a,
-#settings_button a {
+#settings_button a,
+#profile_button a {
     background-position: 8px 50%;
     background-repeat: no-repeat;
     margin-top: .2em;
@@ -565,8 +568,13 @@ a.user_settings {
     background-image: url(images/settings_button.png);
 }
 
+#profile_button a {
+    background-image: url(images/profile_button.png);
+}
+
 #fork_button:hover a,
-#settings_button:hover a {
+#settings_button:hover a,
+#profile_button:hover a {
     color: white;
 }
 
@@ -577,3 +585,11 @@ a.user_settings {
 #settings_button:hover a {
     background-image: url(images/settings_button_hover.png);
 }
+
+#profile_button:hover a {
+    background-image: url(images/profile_button_hover.png);
+}
+
+#profile_button {
+    display: inline-block;
+}
diff --git a/progit/templates/user_settings.html b/progit/templates/user_settings.html
index 64dbec3..a39e94a 100644
--- a/progit/templates/user_settings.html
+++ b/progit/templates/user_settings.html
@@ -1,16 +1,15 @@
 {% extends "master.html" %}
 {% from "_formhelper.html" import render_field_in_cell %}
 
-{% block title %}Settings {{username}}{% endblock %}
+{% block title %}{{ user.user }}'s settings{% endblock %}
 {%block tag %}users{% endblock %}
 
 
 {% block content %}
-
-<h2>Setting {{ user.user }}</h2>
-
-
 <section class="user_settings">
+    <header>
+        <h2>{{ user.user }}'s settings</h2>
+    </header>
   <form action="{{ url_for('user_settings') }}" method="post">
     <table>
       <tr>
@@ -43,11 +42,11 @@
       {{ form.csrf_token }}
 </p>
   </form>
-</section>
+    <aside>
+        <div id="profile_button">
+            <a href="{{ url_for('view_user', username=user.user) }}">Public profile page</a>
+        </div>
+    </aside>
 
-<section class="user_links">
-  <p>
-    <a href="{{ url_for('view_user', username=user.user) }}">Public profile page</a>
-  </p>
 </section>
 {% endblock %}