diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css
index 88123dc..9c1b921 100644
--- a/static/css/bootstrap.css
+++ b/static/css/bootstrap.css
@@ -12,6 +12,7 @@ html {
 }
 body {
   margin: 0;
+  padding-top: 100px;
 }
 article,
 aside,
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 5771863..0a09247 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -1,21 +1,25 @@
    <nav class="navbar navbar-default navbar-fixed-top">
     <div class="container">
-        <div class="navbar-header">
-            <a class="navbar-brand" href="http://gonito.net/">Gonito.net</a>
-        <div id="navbar" class="navbar-collapse collapse">
+          <div class="navbar-header">
+            <a class="navbar-brand" href="@{HomeR}">Gonito.net
+        $maybe user <- maybeUser
           <ul class="nav navbar-nav">
-            $maybe user <- maybeUser
-                _{MsgLoggedAs} #{userIdent $ entityVal user}
+        
                 <li><a href="@{HomeR}">_{MsgHome}</a>
                 $if userIsAdmin $ entityVal user
-                    <li><a href="@{CreateChallengeR}">_{MsgCreateChallenge}</a></li>
-                <li><a href="@{ListChallengesR}">_{MsgListChallenges}</a></li>
-                <li><a href="@{YourAccountR}">_{MsgYourAccount}</a></li>
-                <li><a href="@{AuthR LogoutR}">_{MsgLogOut}</a></li>
-            $nothing
-                    <li><a href="@{AuthR LoginR}">_{MsgLogIn}</a>
+                    <li><a href="@{CreateChallengeR}">_{MsgCreateChallenge}</a>
+                <li><a href="@{ListChallengesR}">_{MsgListChallenges}</a>
+            
+          <ul class="nav navbar-nav navbar-right">
+            <li class="dropdown">
+                <a href="@{AuthR LoginR}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">#{userIdent $ entityVal user}<span class="caret"></span>
+                <ul class="dropdown-menu">
+                    <li><a href="@{YourAccountR}">_{MsgYourAccount}</a></li>
+                    <li><a href="@{AuthR LogoutR}">_{MsgLogOut}</a></li>
+        $nothing  
+            <ul class="nav navbar-nav navbar-right">
+                <li><a href="@{AuthR LoginR}">log in</a>
 $maybe msg <- mmsg
-
     <div #message .alert .alert-warning><a href="#" class="close" data-dismiss="alert">&times;</a> #{msg}
-<br><br><br><br>
+
 ^{widget}
diff --git a/templates/homepage.hamlet b/templates/homepage.hamlet
index 0246c66..0be3ce4 100644
--- a/templates/homepage.hamlet
+++ b/templates/homepage.hamlet
@@ -1,30 +1,29 @@
 <div class="container">
     <div class="jumbotron">
-    <h1>Welcome to Gonito.net!
-    <hr>
-    <p>Gonito (pronounced <i>ɡɔ̃ˈɲitɔ</i>) is a Kaggle<sup><u><a href="#disclaimer">*</a></u></sup>-like platform for machine learning competitions. 
-    <p>What's so special about Gonito:
-    <ul class="list-group">
-      <li class="list-group-item">free & open-source (AGPL), you can use it your own, in your company, at your university, etc. (git repo: <tt><a href="#{browsableGitRepo "gonito"}">git://gonito.net/gonito</a></tt>)
-      <li class="list-group-item">git-based (challenges and solutions are submitted only with git).
+        <h1>Welcome to Gonito.net!
+        <p>Gonito (pronounced <i>ɡɔ̃ˈɲitɔ</i>) is a Kaggle<sup><u><a class="nounderline" href="#disclaimer">*</a></u></sup>-like platform for machine learning competitions.
+
+    <div class="panel panel-default">
+        <div class="panel-heading">What's so special about Gonito:
+        <ul class="list-group">
+            <li class="list-group-item">free & open-source (AGPL), you can use it your own, in your company, at your university, etc. (git repo: <tt><a href="#{browsableGitRepo "gonito"}">git://gonito.net/gonito</a></tt>)
+            <li class="list-group-item">git-based (challenges and solutions are submitted only with git).
 
     $maybe _ <- maybeUser
         $maybe _ <- maybeLocalId
             <p>Go to the <a href="@{ListChallengesR}">challenge list</a> and choose a challenge for you!
         $nothing
-            <h2>How to setup your account?
-            <p>Click <a href="@{YourAccountR}">your account</a> to setup your name, ID and SSH public key.
+            <div class="alert alert-info" role="alert">
+                <p>
+                    <strong>How to setup your account?
+                    Click <a href="@{YourAccountR}">your account</a> to setup your name, ID and SSH public key.
     $nothing
-    <br><br><br>
-        <h2>How to log in?
-        <hr>
 
-        <p>Gonito uses <a href="https://developer.mozilla.org/en-US/Persona">Persona</a> authentication system available in Mozilla Firefox. Other authentication systems are on the way, but for the time being you need to use Firefox.
+        <div class="alert alert-info" role="alert">
+            <p>
+                <strong>How to log in?
+                Gonito uses <a href="https://developer.mozilla.org/en-US/Persona">Persona</a> authentication system available in Mozilla Firefox. Other authentication systems are on the way, but for the time being you need to use Firefox.
 
-        <p>So, just click <a href="@{AuthR LoginR}">log in</a>, then "Sign in with Persona" button and Firefox will guide you!
-        <p>So, just click button below, then "Sign in with Persona" button and Firefox will guide you!</p>
+            <p>So, just click <a href="@{AuthR LoginR}">log in</a>, then "Sign in with Persona" button and Firefox will guide you!
   
-        <br><br>
-        <p>
-        <a class="btn btn-lg btn-primary" href="@{AuthR LoginR}" role="button">Log in »</a>
-    <p><sup>*</sup>Disclaimer: Gonito is neither affiliated with nor endorsed by <a href="https://www.kaggle.com">Kaggle</a>.
+<p class="text-muted pagination-centered"><sup>*</sup>Disclaimer: Gonito is neither affiliated with nor endorsed by <a href="https://www.kaggle.com">Kaggle</a>.