diff --git a/tpl/entries.html b/tpl/entries.html
index 648e1ce9d..8526a3c9d 100644
--- a/tpl/entries.html
+++ b/tpl/entries.html
@@ -1,3 +1,4 @@
+            <div id="content">
                 {loop="entries"}
                     <div id="entry-{$value.id}" class="entrie mb2">
                         <span class="content">
@@ -13,4 +14,5 @@
                             </div>
                         </span>
                     </div>
-                {/loop}
\ No newline at end of file
+                {/loop}
+            </div>
\ No newline at end of file
diff --git a/tpl/footer.html b/tpl/footer.html
index 04bedabcb..b8bd755c8 100644
--- a/tpl/footer.html
+++ b/tpl/footer.html
@@ -1,6 +1,4 @@
-            </div>
-        </div>
-
+		</div>
         <footer class="mr2 mt3 smaller">
             <p>powered by <a href="http://inthepoche.com">poche</a><br />follow us on <a href="https://twitter.com/getpoche" title="follow us on twitter">twitter</a></p>
         </footer>
diff --git a/tpl/head.html b/tpl/head.html
index 66b6895d7..e95f61001 100644
--- a/tpl/head.html
+++ b/tpl/head.html
@@ -19,9 +19,4 @@
         <link rel="stylesheet" href="./css/style-light.css" media="all" title="light-style">
         <!-- Dark Theme -->
         <link rel="alternate stylesheet" href="./css/style-dark.css" media="all" title="dark-style">
-    </head>
-    <body class="light-style">
-        <header>
-            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
-        </header>
-        <div id="main">
\ No newline at end of file
+    </head>
\ No newline at end of file
diff --git a/tpl/home.html b/tpl/home.html
index 28db89c20..752a571b8 100644
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -1,3 +1,8 @@
+    <body class="light-style">
+        <header>
+            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
+        </header>
+        <div id="main">
             <ul id="links">
                 <li><a href="index.php" {if="$view == 'index'"}class="current"{/if}>home</a></li>
                 <li><a href="?view=fav" {if="$view == 'fav'"}class="current"{/if}>favorites</a></li>
@@ -9,4 +14,3 @@
                 <li><img src="img/up.png" onclick="sort_links('{$view}', 'ia');" title="by date asc" /> by date <img src="img/down.png" onclick="sort_links('{$view}', 'id');" title="by date desc" /></li>
                 <li><img src="img/up.png" onclick="sort_links('{$view}', 'ta');" title="by title asc" /> by title <img src="img/down.png" onclick="sort_links('{$view}', 'td');" title="by title desc" /></li>
             </ul>
-            <div id="content">
diff --git a/tpl/login.html b/tpl/login.html
index b78b72e1e..12927692e 100644
--- a/tpl/login.html
+++ b/tpl/login.html
@@ -1,5 +1,9 @@
 {include="head"}
-        <div>
+    <body class="light-style">
+        <header>
+            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
+        </header>
+        <div id="main">
             <form method="post" action="?login" name="loginform">
                 <fieldset>
                     <h2>login to your poche</h2>
diff --git a/tpl/view.html b/tpl/view.html
index 9ba5e208d..4384631b4 100644
--- a/tpl/view.html
+++ b/tpl/view.html
@@ -47,13 +47,6 @@
             <div class="backhome">
                 <a href="index.php" title="back to home">&larr;</a>
             </div>
-        </div>
 
         {include="js"}
-
-        <footer class="mr2 mt3 smaller">
-            <p>powered by <a href="http://inthepoche.com">poche</a><br />follow us on <a href="https://twitter.com/getpoche" title="follow us on twitter">twitter</a></p>
-        </footer>
-
-    </body>
-</html>
\ No newline at end of file
+        {include="footer"}
\ No newline at end of file
