diff --git a/blender-bfct/application/static/assets/css/bfct.css b/blender-bfct/application/static/assets/css/bfct.css
index 778807f..2d2cf25 100644
--- a/blender-bfct/application/static/assets/css/bfct.css
+++ b/blender-bfct/application/static/assets/css/bfct.css
@@ -1,5 +1,6 @@
 @import url(http://fonts.googleapis.com/css?family=Open+Sans);
 @import url(http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300);
+@import url('../../assets_shared/css/font-borg.css');
 
 body {padding: 53px 0 0 0 !important;}
 
diff --git a/blender-bfct/application/static/assets_shared b/blender-bfct/application/static/assets_shared
index 035a524..56f71f6 160000
--- a/blender-bfct/application/static/assets_shared
+++ b/blender-bfct/application/static/assets_shared
@@ -1 +1 @@
-Subproject commit 035a52456b306388cead6843a86e35e8fa0ada1e
+Subproject commit 56f71f65c98d4ca56d1228c897698fffb306467d
diff --git a/blender-bfct/application/templates/applications/view.html b/blender-bfct/application/templates/applications/view.html
index 217c891..e7f7363 100755
--- a/blender-bfct/application/templates/applications/view.html
+++ b/blender-bfct/application/templates/applications/view.html
@@ -135,19 +135,37 @@
         {% endif %}
         <div class="row">
             <div class="col-md-12">
-                <h2>Comments</h2>
-                {% for comment in application.comments %}
-                    <p>{{comment.pretty_creation_date}}
-                    <p>{{comment.user.first_name}} {{comment.user.last_name}}</p>
-                    <p>{{comment.text}}</p>
-                    <hr>
-                {% endfor %}
+                <hr>
+                <h2>Comments
+                {% if application.comments %}
+                    {% for comment in application.comments %}
+                        {% if loop.first %}
+                            <div class="pull-right">
+                                ({{ loop.length }})
+                            </div>
+                        {% endif %}
+                        </h2>
+                        <div class="box offset-bottom-2">
+
+                            <span class="pull-right small"><p><small>{{comment.pretty_creation_date}} <i class="fa fa-clock-o"></i></small></p></span>
+                            <span><h4 class="offset-top-3">{{comment.user.first_name}} {{comment.user.last_name}}</h4></span>
+                            <hr class="offset-top-0 offset-bottom-0"/>
+                            <p>{{comment.text}}</p>
+                        </div>
+                    {% endfor %}
+                {% else %}
+                    </h2>
+                {% endif %}
+
                 <form class="form-horizontal" method="POST" action="{{url_for('applications.comment', application_id=application.id)}}">
                     <fieldset>
                         {{ comment_form.hidden_tag() }}
-                        {{ comment_form.text(class="form-controllo") }}
-                        <button class="btn btn-default btn-squishy width-half pull-right offset-top-2" type="submit" value="Go">
-                            Comment
+                        <div class="input-group input-group-lg width-full">
+                            {{ comment_form.text(class="form-control") }}
+                            <label class="control-label">Leave a comment</label>
+                        </div>
+                        <button class="btn btn-default btn-squishy btn-success width-half pull-right offset-top-2" type="submit" value="Go">
+                            Submit Comment <i class="fa fa-send small"></i>
                         </button>
                     </fieldset>
                 </form>
diff --git a/blender-bfct/application/templates/layout.html b/blender-bfct/application/templates/layout.html
index e9d8423..607e2e2 100644
--- a/blender-bfct/application/templates/layout.html
+++ b/blender-bfct/application/templates/layout.html
@@ -67,6 +67,7 @@
     </div>
     {% endfor %}
 
+  <div class="container-main">
     <div class="container-fluid featured featured-xs">
       <div class="col-md-12">
         <div class="container">
@@ -116,13 +117,90 @@
         </div>
       </div>
     </div> <!-- /container -->
+  </div> <!-- /container-main -->
+
+    <div id="footer-navigation"> <!-- Sitemap -->
+      <div class="container">
+        <div class="row">
+          <div class="col-md-3 col-xs-6 offset-vertical-1">
+            <h4>Blender</h4>
+            <ul>
+              <a href="http://www.blender.org/download/" title="Download Blender">
+                <li>Download</li>
+              </a>
+              <a href="http://www.blender.org/download/" title="Source Code">
+                <li>Source Code</li>
+              </a>
+              <a href="http://www.blender.org/features/" title="Blender Features">
+                <li>Features</li>
+              </a>
+              <a href="http://wiki.blender.org/index.php/Doc:2.6/Manual" title="Blender Documentation">
+                <li>Documentation</li>
+              </a>
+            </ul>
+          </div>
+          <div class="col-md-3 col-xs-6 offset-vertical-1">
+            <h4>Organization</h4>
+            <ul>
+              <a href="http://www.blender.org/foundation/" title="Blender Foundation">
+                <li>Foundation</li>
+              </a>
+              <a href="http://www.blender.org/institute/" title="Blender Institute">
+                <li>Institute</li>
+              </a>
+              <a href="http://www.blender.org/get-involved/developers/" title="Developers">
+                <li>Developers</li>
+              </a>
+              <a href="http://www.blendernetwork.org"
+              title="The Network of Blender Professionals">
+                <li><i class="bf-network"></i> Blender Network</li>
+              </a>
+            </ul>
+          </div>
+          <div class="col-md-3 col-xs-6 offset-vertical-1">
+            <h4>Get Involved</h4>
+            <ul>
+              <a href="http://www.blender.org/foundation/donation-payment/" title="Donations">
+                <li>Donations</li>
+              </a>
+              <a href="http://www.blender.org/get-involved/developers/" title="Software">
+                <li>Software</li>
+              </a>
+              <a href="http://www.blender.org/get-involved/" title="Websites and Docs">
+                <li>Websites & Docs</li>
+              </a>
+              <a href="http://www.blender.org/conference/" title="Conferences">
+                <li>Conferences</li>
+              </a>
+            </ul>
+          </div>
+          <div class="col-md-3 col-xs-12 offset-vertical-1">
+            <h4>Blender.org</h4>
+            <ul>
+              <a href="http://www.blender.org/news/" title="News">
+                <li>News</li>
+              </a>
+              <a href="http://www.blender.org/foundation/" title="Contact">
+                <li>Contact</li>
+              </a>
+              <a href="http://www.blender.org/about/logo/" title="Trademark and Logo">
+                <li>Trademark & Logo</li>
+              </a>
+              <a href="http://www.blender.org/about/website/" title="Website License">
+                <li>Website License</li>
+              </a>
+            </ul>
+          </div>
+        </div> <!-- footer row -->
+      </div> <!-- footer container -->
+    </div> <!-- footer-navigation -->
 
     <footer>
       <div class="container">
         <span class="pull-right">
           <p>
-            Blender Foundation Certified Trainer
-            <a href="#hop"><i class="fa fa-caret-up"></i></a>
+            Blender.org
+            <a href="#hop"><i class="fa fa-angle-up"></i></a>
           </p>
         </span>
       </div> <!-- /footer-container -->
diff --git a/blender-bfct/application/templates/my_application.html b/blender-bfct/application/templates/my_application.html
index 3e029ce..5d0d003 100755
--- a/blender-bfct/application/templates/my_application.html
+++ b/blender-bfct/application/templates/my_application.html
@@ -8,8 +8,8 @@
     </div>
 </div>
 <div class="row">
-    <div class="col-md-12 box">
-        <table class="table table-striped">
+    <div class="col-md-12">
+        <table class="table table-striped box">
             <thead>
                 <tr>
                     <th>Date</th>
@@ -35,7 +35,7 @@
             {% if application.review_end_date %}
             <tr>
                 <td>{{application.show_pretty_date('review_end')}}</td>
-                <td>
+                <td class="info">
                     <strong>Application review ended!</strong>
                     <br/><i class="fa fa-star"></i> 
                     All reviewers have now voted. You'll get an email soon with the results.
@@ -49,7 +49,6 @@
             Thank you for being part of the Blender Foundation Certified Trainers program
         </p>
         {% endif %}
-        <hr/>
     </div>
 </div>