diff --git a/blender-bfct/application/templates/applications/index.html b/blender-bfct/application/templates/applications/index.html
index 403a88a..b6ae9b4 100755
--- a/blender-bfct/application/templates/applications/index.html
+++ b/blender-bfct/application/templates/applications/index.html
@@ -12,22 +12,21 @@
                     <th>Submission Date</th>
                     <th>Status</th>
                     <th class="content-align-center">Approvals</th>
+                    <th></th>
                 </tr>
             </thead>
             <tbody>
             {% for application in applications %}
-                <tr class="table-row-link">
-                    <td class="relative">{{ loop.index }}
-                        <a href="{{url_for('applications.view', id=application.id)}}" >
-                            <div class="application_row"></div>
-                        </a>
-                    </td>
-                    <td>
+                <tr>
+                    <td class="relative">{{ loop.index }}</td>
+                    <td><a href="{{url_for('applications.view', id=application.id)}}" >
                         {{application.user.first_name}} {{application.user.last_name}}
+                        </a>
                     </td>
                     <td>{{application.city_country}}</td>
                     <td>{{application.submission_date.strftime('%d %B, %Y')}}</td>
                     <td>
+                        <a href="{{url_for('applications.view', id=application.id)}}" >
                     {% if application.status == 'under_review' %}
                         <span class="label label-2x label-info"><i class="fa fa-clock-o"></i> Under Review</span>
                     {% elif application.status == 'submitted' %}
@@ -39,12 +38,18 @@
                     {% else %}
                         {{application.status}}
                     {% endif %}
+                        </a>
                     </td>
                     <td class="content-align-center">
                         {{application.approve}}
                             /
                         {{application.approve + application.reject}}
                     </td>
+                    <td>
+                        <a href="{{url_for('applications.view', id=application.id)}}" >
+                            View <i class="fa fa-angle-double-right"></i>
+                        </a>
+                    </td>
                 </tr>
                 {% if loop.last %}
                 </tbody>
@@ -56,5 +61,6 @@
             {% endfor %}
     </div>
 </div>
+<hr/>
 
 {% endblock %}
diff --git a/blender-bfct/application/templates/layout.html b/blender-bfct/application/templates/layout.html
index a20b2b6..c81e8ad 100644
--- a/blender-bfct/application/templates/layout.html
+++ b/blender-bfct/application/templates/layout.html
@@ -42,16 +42,16 @@
             <span class="sr-only">Toggle navigation</span>
             <i class="fa fa-bars"></i>
           </button>
-          <a class="logo" href="http://blender.org"></a>
+          <a class="logo" href="http://www.blender.org"></a>
         </div>
 
         <nav class="collapse navbar-collapse" id="navbar-collapse-menu">
             <ul class="nav navbar-nav navbar-right">
-                <li><a href="http://local.blender.org/features/">Features</a></li>
-                <li><a href="http://local.blender.org/download/">Download</a></li>
-                <li><a href="http://local.blender.org/support/">Support</a></li>
-                <li><a href="http://local.blender.org/get-involved/">Get Involved</a></li>
-                <li><a href="http://local.blender.org/about/">About</a></li>
+                <li><a href="http://www.blender.org/features/">Features</a></li>
+                <li><a href="http://www.blender.org/download/">Download</a></li>
+                <li><a href="http://www.blender.org/support/">Support</a></li>
+                <li><a href="http://www.blender.org/get-involved/">Get Involved</a></li>
+                <li><a href="http://www.blender.org/about/">About</a></li>
                 <li><a href="http://www.blender3d.org/e-shop/">Store</a></li>
             </ul>
         </nav>
@@ -79,11 +79,8 @@
     <header class="navbar navbar-default navbar-secondlevel navbar-static-top bright" role="navigation">
       <div class="container relative">
         <ul class="nav navbar-nav navbar-left">
-          <li {% if title == 'homepage': %} class="active"{% endif %}>
-            <a href="{{ url_for('homepage') }}">About BFCT</a>
-          </li>
-          <li>
-            <a href="http://blendernetwork.org/BFCT">Certified Trainers</a>
+          <li {% if title == 'home': %} class="active"{% endif %}>
+            <a href="{{ url_for('homepage') }}">About</a>
           </li>
           <li {% if title == 'become_a_trainer': %} class="active"{% endif %}>
             <a href="{{ url_for('become_a_trainer') }}">Become a Trainer</a>
@@ -106,7 +103,7 @@
             </ul>
           </li>
           {% else %}
-          <li><a href="{{url_for_security('login')}}">Log in</a></li>
+          <li class="absolute right"><a href="{{url_for_security('login')}}"><i class="fa fa-sign-in"></i> Sign in</a></li>
           {% endif %}
         </ul>
       </div>
diff --git a/blender-bfct/application/templates/security/login_user.html b/blender-bfct/application/templates/security/login_user.html
index fc0aaf6..3ed8b84 100644
--- a/blender-bfct/application/templates/security/login_user.html
+++ b/blender-bfct/application/templates/security/login_user.html
@@ -47,7 +47,7 @@ body {
 
 <div class="container-fluid">
   <div class="row" id="featured">
-    <div class="container">
+    <div class="container box">
       <form class="form-signin" role="login" action="{{ url_for_security('login') }}" method="POST" name="login_user_form">
         {{ login_user_form.hidden_tag() }}
         <h2 class="form-signin-heading">Please sign in</h2>