diff --git a/code/templates/authenticate.html b/code/templates/authenticate.html
index 298d5bc..b4d2836 100644
--- a/code/templates/authenticate.html
+++ b/code/templates/authenticate.html
@@ -1,8 +1,14 @@
 {% extends "layout.html" %}
 {% block body %}
+<div id=index_menu>
   authenticate to {{ name|safe  }}
-  <form action={{ url_for('authenticate',name=name) }} method=post enctype=multipart/form-data>
+  <div id=index_enter>
+    <form action={{ url_for('authenticate',name=name) }} method=post enctype=multipart/form-data>
      <p><input type=password name=password autofocus>
-       <input type=submit value=Login>
+     <input type=submit value=Login>
   </form>
+  </div>
+</div>
+
+
 {% endblock %}
diff --git a/code/templates/index.html b/code/templates/index.html
index a6ca6a7..5103e7b 100755
--- a/code/templates/index.html
+++ b/code/templates/index.html
@@ -4,7 +4,7 @@
   <div id=index_menu>
    <div id=index_enter>
 		<input id="index_form_name" type=text name=name title="Hidden share name"
-		  onkeydown="index_form_enter(event)">
+		  onkeydown="index_form_enter(event)" autofocus>
 		<input type=submit value=Go onclick="index_form_submit()">
    </div>
   </div>
@@ -20,8 +20,8 @@
   <tbody>
   {% for entry in entries %}
     <tr>
-      <td><a 
-             href="{{ url_for('list_view',name=entry.name) }}" 
+      <td><a
+             href="{{ url_for('list_view',name=entry.name) }}"
              title="{{ entry.description | safe }}"
           >{{ entry.name }}</a>
           {% if entry.password_set %}(Logged in){% endif %}
diff --git a/code/templates/logout.html b/code/templates/logout.html
index cf20c31..ba67cf1 100644
--- a/code/templates/logout.html
+++ b/code/templates/logout.html
@@ -1,5 +1,10 @@
 {% extends "layout.html" %}
 {% block body %}
-  <p>You are logged out from <a href="{{ url_for('list_view',name=name) }}">{{ name|safe  }}</a></p>
+<div id=index_menu>
+  <p>You logged out from share <a href="{{ url_for('list_view',name=name) }}">{{ name|safe }}</a></p>
   <p>Continue to <a href="{{ url_for('index') }}">index</a></p>
+</div>
+
+
+
 {% endblock %}