diff --git a/templates/challenge-all-submissions.hamlet b/templates/challenge-all-submissions.hamlet
index f492d02..9d2edd5 100644
--- a/templates/challenge-all-submissions.hamlet
+++ b/templates/challenge-all-submissions.hamlet
@@ -1,8 +1,3 @@
 <p>(This is a long list of all submissions, if you want to see only the best, click <a href="@{ShowChallengeR (challengeName challenge)}">leaderboard</a>.)
 
 ^{Table.buildBootstrap (submissionsTable tests) submissions}
-
-<div id="graph-container">
-
-<script src="/static/js/sigma.min.js">
-<script src="/static/js/sigma.parsers.json.min.js">
diff --git a/templates/challenge-submission.hamlet b/templates/challenge-submission.hamlet
index 8f75ed9..ad5b5a9 100644
--- a/templates/challenge-submission.hamlet
+++ b/templates/challenge-submission.hamlet
@@ -1,7 +1,19 @@
 <h2>_{MsgSubmitSolution}
+<hr>
 
-<p>
-  <form method=post action=@{ChallengeSubmissionR (challengeName challenge)}#form enctype=#{formEnctype}>
-    ^{formWidget}
-    <button .btn .btn-primary type="submit">
-       _{MsgSubmit} <span class="glyphicon glyphicon-upload"></span>
+<form class="form-horizontal" role="form" method="post" action=@{ChallengeSubmissionR (challengeName challenge)}#form enctype=#{formEnctype}>
+    <div class="form-group">
+        <label class="control-label col-sm-3" for="hident2">Submission description:
+        <div class="col-sm-5">
+            <input id="hident2" name="f1" type="text" value="" class="form-control" id="email" placeholder="Submission description">
+    <div class="form-group">
+        <label class="control-label col-sm-3" for="hident3">Submission repo URL:
+        <div class="col-sm-5">          
+            <input id="hident3" name="f2" type="text" required value="" class="form-control" id="pwd" placeholder="Submission repo URL">
+    <div class="form-group">
+        <label class="control-label col-sm-3" for="hident4">Submission repo branch:
+        <div class="col-sm-2">          
+            <input id="hident4" name="f3" type="text" required value="" class="form-control" id="pwd" placeholder="Submission repo branch">
+    <div class="form-group">        
+        <div class="col-sm-offset-3 col-sm-10">
+            <button type="submit" class="btn btn-primary">_{MsgSubmit}
diff --git a/templates/challenge.lucius b/templates/challenge.lucius
index 56d16ea..a6a174c 100644
--- a/templates/challenge.lucius
+++ b/templates/challenge.lucius
@@ -8,9 +8,4 @@
     width: auto;
     overflow: hidden;
     left-margin: 5px;
-}
-
-#graph-container {
-    height: 400px;
-    margin: auto;
-}
+}
\ No newline at end of file
diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet
index 5b7bf3c..f0cfcc2 100644
--- a/templates/default-layout-wrapper.hamlet
+++ b/templates/default-layout-wrapper.hamlet
@@ -11,13 +11,19 @@ $newline never
     <title>#{pageTitle pc}
     <meta name="description" content="">
     <meta name="author" content="">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
+          integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css"
+          integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous">
 
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
     ^{pageHead pc}
 
     \<!--[if lt IE 9]>
-    \<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    \<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js">
     \<![endif]-->
 
     <script src="/static/js/jquery.js" type="text/javascript">
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index a64800b..5771863 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -1,14 +1,21 @@
-    <div id="heading">
-     $maybe user <- maybeUser
-        _{MsgLoggedAs} #{userIdent $ entityVal user}
-        \ | <a href="@{HomeR}">_{MsgHome}</a>
-        $if userIsAdmin $ entityVal user
-           \ | <a href="@{CreateChallengeR}">_{MsgCreateChallenge}</a>
-        \ | <a href="@{ListChallengesR}">_{MsgListChallenges}</a>
-        \ | <a href="@{YourAccountR}">_{MsgYourAccount}</a>
-        \ | <a href="@{AuthR LogoutR}">_{MsgLogOut}</a>
-     $nothing
-        <a href="@{AuthR LoginR}">_{MsgLogIn}</a>
+   <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">
+          <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>
 $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 ddc4d4a..0246c66 100644
--- a/templates/homepage.hamlet
+++ b/templates/homepage.hamlet
@@ -1,24 +1,30 @@
-<h1>Welcome to Gonito.net!
+<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).
 
-<p>Gonito.net (pronounced <i>ɡɔ̃ˈɲitɔ</i>) is a Kaggle<sup><a href="#disclaimer">*</a></sup>-like platform for machine learning competitions.
+    $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.
+    $nothing
+    <br><br><br>
+        <h2>How to log in?
+        <hr>
 
-<p>What's so special about Gonito.net:
+        <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.
 
-<ul>
-  <li>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>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.
-$nothing
-  <h2>How to log in?
-
-  <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.
-
-  <p>So, just click <a href="@{AuthR LoginR}">log in</a>, then "Sign in with Persona" button and Firefox will guide you!
-
-<p><sup>*</sup>Disclaimer: Gonito is neither affiliated with nor endorsed by <a href="https://www.kaggle.com">Kaggle</a>.
\ No newline at end of file
+        <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>
+  
+        <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>.
diff --git a/templates/your-account.hamlet b/templates/your-account.hamlet
index acc7b45..5880ecc 100644
--- a/templates/your-account.hamlet
+++ b/templates/your-account.hamlet
@@ -1,14 +1,27 @@
-<h2>Your account
-
-<p>
-  <form method=post action=@{YourAccountR}#form enctype=#{formEnctype}>
-    ^{formWidget}
-    <button .btn .btn-primary type="submit">
-       _{MsgSubmit} <span class="glyphicon glyphicon-upload"></span>
-
-<ul>
-  <li><b>name</b> is your human-readable name (to be shown on the leaderboard)
-  <li><b>ID</b> is used in the URLs for your repos (must be composed of lower-case letters, digits or hyphyns, must start with a lower-case letter)
-  <li><b>SSH public key</b> is needed if you want to access repos hosted on Gonito.net
-  <li>ID cannot be changed once it is set up
-  <li>you don't need to specify your ID and SSH public key, if you don't use private repos hosted on Gonito.net
+<div class="container">
+    <div id="main" role="main">
+        <h2>Your account
+        <hr>
+        <form class="form-horizontal" role="form" method="post" action=@{YourAccountR}#form enctype=#{formEnctype}>
+            <div class="form-group">
+                <label class="control-label col-sm-2" for="hident2">Name:
+                <div class="col-sm-2">
+                    <input id="hident2" name="f1" type="text" value="" class="form-control"  placeholder="Your name">
+            <div class="form-group">
+                <label class="control-label col-sm-2" for="hident3">ID:
+                <div class="col-sm-2">          
+                    <input id="hident3" name="f2" type="text" value="" class="form-control"  placeholder="Your id">
+            <div class="form-group">
+                <label class="control-label col-sm-2" for="hident4">Your SSH public key:
+                <div class="col-sm-5">          
+                    <input id="hident4" name="f3" type="text" value="" class="form-control"  placeholder="SSH public key">
+            <div class="form-group">        
+                <div class="col-sm-offset-2 col-sm-10">
+                    <button type="submit" class="btn btn-default">_{MsgSubmit}
+        <hr>
+        <ul class="list-group">
+            <li class="list-group-item"><b>Name</b> is your human-readable name (to be shown on the leaderboard).
+            <li class="list-group-item"><b>ID</b> is used in the URLs for your repos (must be composed of lower-case letters, digits or hyphyns, must start with a lower-case letter).
+            <li class="list-group-item"><b>SSH public key</b> is needed if you want to access repos hosted on Gonito.net.
+            <li class="list-group-item">ID cannot be changed once it is set up.
+            <li class="list-group-item">You don't need to specify your ID and SSH public key, if you don't use private repos hosted on Gonito.net.
\ No newline at end of file