diff --git a/app/controllers/about.php b/app/controllers/about.php
index 07e3020..6e28118 100644
--- a/app/controllers/about.php
+++ b/app/controllers/about.php
@@ -12,7 +12,7 @@ use Miniflux\Helper;
 Router\get_action('about', function () {
     $user_id = SessionStorage::getInstance()->getUserId();
 
-    Response\html(Template\layout('about', array(
+    Response\html(Template\layout('config/about', array(
         'csrf'   => Helper\generate_csrf(),
         'config' => Model\Config\get_all($user_id),
         'user'   => Model\User\get_user_by_id_without_password($user_id),
diff --git a/app/controllers/api.php b/app/controllers/api.php
index 3dc68cb..2df429c 100644
--- a/app/controllers/api.php
+++ b/app/controllers/api.php
@@ -11,7 +11,7 @@ use Miniflux\Template;
 Router\get_action('api', function () {
     $user_id = SessionStorage::getInstance()->getUserId();
 
-    Response\html(Template\layout('api', array(
+    Response\html(Template\layout('config/api', array(
         'config' => Model\Config\get_all($user_id),
         'user'   => Model\User\get_user_by_id_without_password($user_id),
         'menu'   => 'config',
diff --git a/app/controllers/auth.php b/app/controllers/auth.php
index 9ab62c2..3ed6f93 100644
--- a/app/controllers/auth.php
+++ b/app/controllers/auth.php
@@ -27,7 +27,7 @@ Router\get_action('login', function () {
         Response\redirect('?action=unread');
     }
 
-    Response\html(Template\load('login', array(
+    Response\html(Template\load('auth/login', array(
         'errors' => array(),
         'values' => array(
             'csrf' => Helper\generate_csrf(),
@@ -45,7 +45,7 @@ Router\post_action('login', function () {
         Response\redirect('?action=unread');
     }
 
-    Response\html(Template\load('login', array(
+    Response\html(Template\load('auth/login', array(
         'errors' => $errors,
         'values' => $values + array('csrf' => Helper\generate_csrf()),
     )));
diff --git a/app/controllers/bookmark.php b/app/controllers/bookmark.php
index 62f5fab..f455022 100644
--- a/app/controllers/bookmark.php
+++ b/app/controllers/bookmark.php
@@ -73,7 +73,7 @@ Router\get_action('bookmarks', function () {
         $feed_ids
     );
 
-    Response\html(Template\layout('bookmarks', array(
+    Response\html(Template\layout('bookmarks/items', array(
         'favicons' => Model\Favicon\get_items_favicons($items),
         'original_marks_read' => Helper\config('original_marks_read'),
         'order' => '',
diff --git a/app/controllers/config.php b/app/controllers/config.php
index 8fbe526..030ec9b 100644
--- a/app/controllers/config.php
+++ b/app/controllers/config.php
@@ -26,7 +26,7 @@ Router\get_action('generate-tokens', function () {
 Router\get_action('config', function () {
     $user_id = SessionStorage::getInstance()->getUserId();
 
-    Response\html(Template\layout('config', array(
+    Response\html(Template\layout('config/preferences', array(
         'errors' => array(),
         'values' => Model\Config\get_all($user_id) + array('csrf' => Helper\generate_csrf()),
         'languages' => Model\Config\get_languages(),
@@ -61,7 +61,7 @@ Router\post_action('config', function () {
         Response\redirect('?action=config');
     }
 
-    Response\html(Template\layout('config', array(
+    Response\html(Template\layout('config/preferences', array(
         'errors' => $errors,
         'values' => Model\Config\get_all($user_id) + array('csrf' => Helper\generate_csrf()),
         'languages' => Model\Config\get_languages(),
diff --git a/app/controllers/feed.php b/app/controllers/feed.php
index a8b0269..5a8aec5 100644
--- a/app/controllers/feed.php
+++ b/app/controllers/feed.php
@@ -30,7 +30,7 @@ Router\get_action('edit-feed', function () {
         'feed_group_ids' => Model\Group\get_feed_group_ids($feed_id)
     );
 
-    Response\html(Template\layout('edit_feed', array(
+    Response\html(Template\layout('feeds/edit', array(
         'values' => $values,
         'errors' => array(),
         'groups' => Model\Group\get_all($user_id),
@@ -64,7 +64,7 @@ Router\post_action('edit-feed', function () {
         }
     }
 
-    Response\html(Template\layout('edit_feed', array(
+    Response\html(Template\layout('feeds/edit', array(
         'values' => $values,
         'errors' => $errors,
         'groups' => Model\Group\get_all($user_id),
@@ -78,7 +78,7 @@ Router\get_action('confirm-remove-feed', function () {
     $user_id = SessionStorage::getInstance()->getUserId();
     $feed_id = Request\int_param('feed_id');
 
-    Response\html(Template\layout('confirm_remove_feed', array(
+    Response\html(Template\layout('feeds/remove', array(
         'feed' => Model\Feed\get_feed($user_id, $feed_id),
         'menu' => 'feeds',
         'title' => t('Confirmation')
@@ -133,7 +133,7 @@ Router\get_action('feeds', function () {
         Response\redirect('?action=unread');
     }
 
-    Response\html(Template\layout('feeds', array(
+    Response\html(Template\layout('feeds/list', array(
         'favicons'        => Model\Favicon\get_feeds_favicons($feeds),
         'feeds'           => $feeds,
         'nothing_to_read' => $nothing_to_read,
@@ -155,7 +155,7 @@ Router\get_action('add', function () {
         'feed_group_ids'   => array(),
     );
 
-    Response\html(Template\layout('add', array(
+    Response\html(Template\layout('feeds/create', array(
         'values' => $values + array('csrf' => Helper\generate_csrf()),
         'errors' => array(),
         'groups' => Model\Group\get_all($user_id),
@@ -209,7 +209,7 @@ Router\action('subscribe', function () {
         SessionStorage::getInstance()->setFlashErrorMessage($error_message);
     }
 
-    Response\html(Template\layout('add', array(
+    Response\html(Template\layout('feeds/create', array(
         'values' => $values + array('csrf' => Helper\generate_csrf()),
         'groups' => Model\Group\get_all($user_id),
         'menu'   => 'feeds',
diff --git a/app/controllers/help.php b/app/controllers/help.php
index a03ede4..4f58dce 100644
--- a/app/controllers/help.php
+++ b/app/controllers/help.php
@@ -12,15 +12,9 @@ use Miniflux\Template;
 Router\get_action('help', function () {
     $user_id = SessionStorage::getInstance()->getUserId();
 
-    Response\html(Template\layout('help', array(
+    Response\html(Template\layout('config/help', array(
         'config' => Model\Config\get_all($user_id),
         'menu' => 'config',
         'title' => t('Help')
     )));
 });
-
-// Show help
-Router\get_action('show-help', function () {
-    Response\html(Template\load('show_help'));
-});
-
diff --git a/app/controllers/history.php b/app/controllers/history.php
index 690583f..c99da52 100644
--- a/app/controllers/history.php
+++ b/app/controllers/history.php
@@ -13,7 +13,7 @@ use Miniflux\Model;
 Router\get_action('history', function () {
     $params = items_list(Model\Item\STATUS_READ);
 
-    Response\html(Template\layout('history', $params + array(
+    Response\html(Template\layout('history/items', $params + array(
         'title' => t('History') . ' (' . $params['nb_items'] . ')',
         'menu'  => 'history',
     )));
@@ -23,7 +23,7 @@ Router\get_action('history', function () {
 Router\get_action('confirm-flush-history', function () {
     $group_id = Request\int_param('group_id');
     
-    Response\html(Template\layout('confirm_flush_items', array(
+    Response\html(Template\layout('history/flush', array(
         'group_id' => $group_id,
         'menu' => 'history',
         'title' => t('Confirmation')
diff --git a/app/controllers/item.php b/app/controllers/item.php
index 49778c5..3087dad 100644
--- a/app/controllers/item.php
+++ b/app/controllers/item.php
@@ -20,7 +20,7 @@ Router\get_action('unread', function () {
         Response\redirect('?action='.$action.'&nothing_to_read=1');
     }
 
-    Response\html(Template\layout('unread_items', $params + array(
+    Response\html(Template\layout('unread/items', $params + array(
         'title' => 'Miniflux (' . $params['nb_items'] . ')',
         'menu'  => 'unread',
     )));
@@ -64,7 +64,7 @@ Router\get_action('show', function () {
         $item['enclosure_url'] = Handler\Proxy\rewrite_link($item['enclosure_url']);
     }
 
-    Response\html(Template\layout('show_item', array(
+    Response\html(Template\layout('item/show', array(
         'item' => $item,
         'feed' => $feed,
         'item_nav' => isset($nav) ? $nav : null,
@@ -85,7 +85,7 @@ Router\get_action('feed-items', function () {
     $items = Model\ItemFeed\get_all_items($user_id, $feed_id, $offset, Helper\config('items_per_page'), $order, $direction);
     $nb_items = Model\ItemFeed\count_items($user_id, $feed_id);
 
-    Response\html(Template\layout('feed_items', array(
+    Response\html(Template\layout('feeds/items', array(
         'favicons' => Model\Favicon\get_favicons_by_feed_ids(array($feed['id'])),
         'original_marks_read' => Helper\config('original_marks_read'),
         'order' => $order,
diff --git a/app/controllers/opml.php b/app/controllers/opml.php
index af4081e..73d1b56 100644
--- a/app/controllers/opml.php
+++ b/app/controllers/opml.php
@@ -19,7 +19,7 @@ Router\get_action('export', function () {
 
 // OPML import form
 Router\get_action('import', function () {
-    Response\html(Template\layout('import', array(
+    Response\html(Template\layout('config/import', array(
         'errors' => array(),
         'menu' => 'feeds',
         'title' => t('OPML Import')
diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index e8fce4c..4ad4363 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -14,7 +14,7 @@ use Miniflux\Validator;
 Router\get_action('profile', function () {
     $user_id = SessionStorage::getInstance()->getUserId();
 
-    Response\html(Template\layout('profile', array(
+    Response\html(Template\layout('users/profile', array(
         'errors' => array(),
         'values' => Model\User\get_user_by_id_without_password($user_id) + array('csrf' => Helper\generate_csrf()),
         'menu' => 'config',
@@ -40,7 +40,7 @@ Router\post_action('profile', function () {
         Response\redirect('?action=profile');
     }
 
-    Response\html(Template\layout('profile', array(
+    Response\html(Template\layout('users/profile', array(
         'errors' => $errors,
         'values' => Model\User\get_user_by_id_without_password($user_id) + array('csrf' => Helper\generate_csrf()),
         'menu' => 'config',
diff --git a/app/controllers/search.php b/app/controllers/search.php
index 47e5b28..9466949 100644
--- a/app/controllers/search.php
+++ b/app/controllers/search.php
@@ -22,7 +22,7 @@ Router\get_action('search', function() {
         $nb_items = Model\ItemSearch\count_items($user_id, $text);
     }
 
-    Response\html(Template\layout('search', array(
+    Response\html(Template\layout('search/items', array(
         'favicons' => Model\Favicon\get_items_favicons($items),
         'original_marks_read' => Helper\config('original_marks_read'),
         'text' => $text,
diff --git a/app/controllers/services.php b/app/controllers/services.php
index a3fa059..9accb67 100644
--- a/app/controllers/services.php
+++ b/app/controllers/services.php
@@ -14,7 +14,7 @@ use Miniflux\Helper;
 Router\get_action('services', function () {
     $user_id = SessionStorage::getInstance()->getUserId();
 
-    Response\html(Template\layout('services', array(
+    Response\html(Template\layout('config/services', array(
         'errors' => array(),
         'values' => Model\Config\get_all($user_id) + array('csrf' => Helper\generate_csrf()),
         'menu' => 'config',
diff --git a/app/controllers/users.php b/app/controllers/users.php
index a4fd7a2..bfc8223 100644
--- a/app/controllers/users.php
+++ b/app/controllers/users.php
@@ -16,7 +16,7 @@ Router\get_action('users', function () {
         Response\text('Access Forbidden', 403);
     }
 
-    Response\html(Template\layout('users', array(
+    Response\html(Template\layout('users/list', array(
         'users'      => Model\User\get_all_users(),
         'menu'       => 'config',
         'title'      => t('Users'),
@@ -28,7 +28,7 @@ Router\get_action('new-user', function () {
         Response\text('Access Forbidden', 403);
     }
 
-    Response\html(Template\layout('new_user', array(
+    Response\html(Template\layout('users/create', array(
         'values' => array('csrf' => Helper\generate_csrf()),
         'errors' => array(),
         'menu'   => 'config',
@@ -55,7 +55,7 @@ Router\post_action('new-user', function () {
         Response\redirect('?action=users');
     }
 
-    Response\html(Template\layout('new_user', array(
+    Response\html(Template\layout('users/create', array(
         'values' => $values + array('csrf' => Helper\generate_csrf()),
         'errors' => $errors,
         'menu'   => 'config',
@@ -74,7 +74,7 @@ Router\get_action('edit-user', function () {
         Response\redirect('?action=users');
     }
 
-    Response\html(Template\layout('edit_user', array(
+    Response\html(Template\layout('users/edit', array(
         'values' => $user + array('csrf' => Helper\generate_csrf()),
         'errors' => array(),
         'menu'   => 'config',
@@ -103,7 +103,7 @@ Router\post_action('edit-user', function () {
         Response\redirect('?action=users');
     }
 
-    Response\html(Template\layout('edit_user', array(
+    Response\html(Template\layout('users/edit', array(
         'values' => $values + array('csrf' => Helper\generate_csrf()),
         'errors' => $errors,
         'menu'   => 'config',
@@ -116,7 +116,7 @@ Router\get_action('confirm-remove-user', function () {
         Response\text('Access Forbidden', 403);
     }
 
-    Response\html(Template\layout('confirm_remove_user', array(
+    Response\html(Template\layout('users/remove', array(
         'user'       => Model\User\get_user_by_id_without_password(Request\int_param('user_id')),
         'csrf_token' => Helper\generate_csrf(),
         'menu'       => 'config',
diff --git a/app/templates/login.php b/app/templates/auth/login.php
similarity index 100%
rename from app/templates/login.php
rename to app/templates/auth/login.php
diff --git a/app/templates/bookmarks.php b/app/templates/bookmarks/items.php
similarity index 79%
rename from app/templates/bookmarks.php
rename to app/templates/bookmarks/items.php
index 02fe84a..66b54d6 100644
--- a/app/templates/bookmarks.php
+++ b/app/templates/bookmarks/items.php
@@ -1,7 +1,8 @@
 <?php if (empty($items) && $group_id === null): ?>
     <p class="alert alert-info"><?php echo t('No bookmark') ?></p>
 <?php else: ?>
-    <?php echo Miniflux\Template\load('search_form') ?>
+    <?php echo Miniflux\Template\load('common/search') ?>
+
     <div class="page-header">
         <h2><?php echo t('Bookmarks') ?><span id="page-counter"><?php echo isset($nb_items) ? $nb_items : '' ?></span></h2>
         <?php if (!empty($groups)): ?>
@@ -15,7 +16,6 @@
             </ul>
         </nav>
         <?php endif ?>
-
     </div>
 
     <?php if ($nothing_to_read): ?>
@@ -24,7 +24,7 @@
 
     <section class="items" id="listing">
         <?php foreach ($items as $item): ?>
-            <?php echo Miniflux\Template\load('item', array(
+            <?php echo Miniflux\Template\load('items/item', array(
                 'item' => $item,
                 'menu' => $menu,
                 'offset' => $offset,
@@ -36,6 +36,6 @@
             )) ?>
         <?php endforeach ?>
 
-        <?php echo Miniflux\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
+        <?php echo Miniflux\Template\load('items/paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
     </section>
 <?php endif ?>
diff --git a/app/templates/keyboard_shortcuts.php b/app/templates/common/keyboard_shortcuts.php
similarity index 100%
rename from app/templates/keyboard_shortcuts.php
rename to app/templates/common/keyboard_shortcuts.php
diff --git a/app/templates/common/menu.php b/app/templates/common/menu.php
new file mode 100644
index 0000000..e63cbae
--- /dev/null
+++ b/app/templates/common/menu.php
@@ -0,0 +1,38 @@
+<header>
+    <nav>
+        <a class="logo" href="?"><?php echo tne('mini%sflux%s','<span>','</span>') ?></a>
+        <ul>
+            <li<?php echo isset($menu) && $menu === 'unread' ? ' class="active"' : '' ?>>
+                <a href="?action=unread"><?php echo t('unread') ?><span id="nav-counter"><?php echo empty($nb_unread_items) ? '' : $nb_unread_items ?></span></a>
+            </li>
+            <li class="hide-mobile<?php echo isset($menu) && $menu === 'bookmarks' ? ' active' : '' ?>">
+                <a href="?action=bookmarks"><?php echo t('bookmarks') ?></a>
+            </li>
+            <li class="hide-mobile<?php echo isset($menu) && $menu === 'history' ? ' active' : '' ?>">
+                <a href="?action=history"><?php echo t('history') ?></a>
+            </li>
+            <li class="hide-mobile<?php echo isset($menu) && $menu === 'feeds' ? ' active' : '' ?>">
+                <a href="?action=feeds"><?php echo t('subscriptions') ?></a>
+            </li>
+            <li class="hide-mobile<?php echo isset($menu) && $menu === 'config' ? ' active' : '' ?>">
+                <a href="?action=config"><?php echo t('preferences') ?></a>
+            </li>
+            <li class="hide-mobile">
+                <a href="?action=logout"><?php echo t('logout') ?></a>
+            </li>
+            <li class="hide-desktop">
+                <span data-action="toggle-menu-more" class="menu-more-switcher" href="#">∨ <?php echo t('menu') ?></span>
+            </li>
+        </ul>
+    </nav>
+</header>
+<div id="menu-more" class="hide">
+    <ul>
+        <li<?php echo isset($menu) && $menu === 'unread' ? ' class="active"' : '' ?>><a href="?action=unread"><?= t('unread') ?></a></li>
+        <li<?php echo isset($menu) && $menu === 'bookmarks' ? ' class="active"' : '' ?>><a href="?action=bookmarks"><?= t('bookmarks') ?></a></li>
+        <li<?php echo isset($menu) && $menu === 'history' ? ' class="active"' : '' ?>><a href="?action=history"><?= t('history') ?></a></li>
+        <li<?php echo isset($menu) && $menu === 'feeds' ? ' class="active"' : '' ?>><a href="?action=feeds"><?= t('subscriptions') ?></a></li>
+        <li<?php echo isset($menu) && $menu === 'config' ? ' class="active"' : '' ?>><a href="?action=config"><?= t('preferences') ?></a></li>
+        <li><a href="?action=logout"><?= t('logout') ?></a></li>
+    </ul>
+</div>
diff --git a/app/templates/search_form.php b/app/templates/common/search.php
similarity index 100%
rename from app/templates/search_form.php
rename to app/templates/common/search.php
diff --git a/app/templates/about.php b/app/templates/config/about.php
similarity index 100%
rename from app/templates/about.php
rename to app/templates/config/about.php
diff --git a/app/templates/api.php b/app/templates/config/api.php
similarity index 100%
rename from app/templates/api.php
rename to app/templates/config/api.php
diff --git a/app/templates/help.php b/app/templates/config/help.php
similarity index 97%
rename from app/templates/help.php
rename to app/templates/config/help.php
index 77a3ffa..5d14e66 100644
--- a/app/templates/help.php
+++ b/app/templates/config/help.php
@@ -15,7 +15,7 @@
     </nav>
 </div>
 <section>
-    <?php echo Miniflux\Template\load('keyboard_shortcuts') ?>
+    <?php echo Miniflux\Template\load('common/keyboard_shortcuts') ?>
 </section>
 <div class="page-section">
     <h2><?php echo t('Documentation') ?></h2>
diff --git a/app/templates/help_layer.php b/app/templates/config/help_layer.php
similarity index 65%
rename from app/templates/help_layer.php
rename to app/templates/config/help_layer.php
index 8b62bc3..13be58e 100644
--- a/app/templates/help_layer.php
+++ b/app/templates/config/help_layer.php
@@ -1,6 +1,6 @@
 <div id="help-layer" class="hide">
     <span class="btn-close" data-action="close-help">&times;</span>
     <section>
-        <?php echo Miniflux\Template\load('keyboard_shortcuts') ?>
+        <?php echo Miniflux\Template\load('common/keyboard_shortcuts') ?>
     </section>
 </div>
diff --git a/app/templates/import.php b/app/templates/config/import.php
similarity index 100%
rename from app/templates/import.php
rename to app/templates/config/import.php
diff --git a/app/templates/config.php b/app/templates/config/preferences.php
similarity index 100%
rename from app/templates/config.php
rename to app/templates/config/preferences.php
diff --git a/app/templates/services.php b/app/templates/config/services.php
similarity index 100%
rename from app/templates/services.php
rename to app/templates/config/services.php
diff --git a/app/templates/database.php b/app/templates/database.php
deleted file mode 100644
index 1e2ddcc..0000000
--- a/app/templates/database.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="page-header">
-    <h2><?php echo $title ?></h2>
-    <nav>
-        <ul>
-            <li><a href="?action=config"><?php echo t('general') ?></a></li>
-            <li><a href="?action=services"><?php echo t('external services') ?></a></li>
-            <li><a href="?action=api"><?php echo t('api') ?></a></li>
-            <li class="active"><a href="?action=database"><?php echo t('database') ?></a></li>
-            <li><a href="?action=help"><?php echo t('help') ?></a></li>
-            <li><a href="?action=about"><?php echo t('about') ?></a></li>
-        </ul>
-    </nav>
-</div>
-<section>
-    <div class="panel panel-default">
-        <ul>
-            <li><?php echo t('Database size:') ?> <strong><?php echo Miniflux\Helper\format_bytes($db_size) ?></strong></li>
-            <li><a href="?action=optimize-db&amp;csrf=<?php echo $csrf ?>"><?php echo t('Optimize the database') ?></a> <?php echo t('(VACUUM command)') ?></li>
-            <li><a href="?action=download-db&amp;csrf=<?php echo $csrf ?>"><?php echo t('Download the entire database') ?></a> <?php echo t('(Gzip compressed Sqlite file)') ?></li>
-        </ul>
-    </div>
-</section>
diff --git a/app/templates/add.php b/app/templates/feeds/create.php
similarity index 100%
rename from app/templates/add.php
rename to app/templates/feeds/create.php
diff --git a/app/templates/edit_feed.php b/app/templates/feeds/edit.php
similarity index 100%
rename from app/templates/edit_feed.php
rename to app/templates/feeds/edit.php
diff --git a/app/templates/feed_items.php b/app/templates/feeds/items.php
similarity index 88%
rename from app/templates/feed_items.php
rename to app/templates/feeds/items.php
index 859043a..3e71070 100644
--- a/app/templates/feed_items.php
+++ b/app/templates/feeds/items.php
@@ -30,7 +30,7 @@
 
     <section class="items" id="listing" data-feed-id="<?php echo $feed['id'] ?>">
         <?php foreach ($items as $item): ?>
-            <?php echo Miniflux\Template\load('item', array(
+            <?php echo Miniflux\Template\load('items/item', array(
                 'feed' => $feed,
                 'item' => $item,
                 'menu' => $menu,
@@ -47,7 +47,7 @@
             <a href="?action=mark-feed-as-read&amp;feed_id=<?php echo $feed['id'] ?>" data-action="mark-feed-read"><?php echo t('mark all as read') ?></a>
         </div>
 
-        <?php echo Miniflux\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'feed_id' => $feed['id'])) ?>
+        <?php echo Miniflux\Template\load('items/paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'feed_id' => $feed['id'])) ?>
     </section>
 
 <?php endif ?>
diff --git a/app/templates/feeds.php b/app/templates/feeds/list.php
similarity index 100%
rename from app/templates/feeds.php
rename to app/templates/feeds/list.php
diff --git a/app/templates/confirm_remove_feed.php b/app/templates/feeds/remove.php
similarity index 100%
rename from app/templates/confirm_remove_feed.php
rename to app/templates/feeds/remove.php
diff --git a/app/templates/confirm_flush_items.php b/app/templates/history/flush.php
similarity index 100%
rename from app/templates/confirm_flush_items.php
rename to app/templates/history/flush.php
diff --git a/app/templates/history.php b/app/templates/history/items.php
similarity index 84%
rename from app/templates/history.php
rename to app/templates/history/items.php
index b5abb2f..3d348e4 100644
--- a/app/templates/history.php
+++ b/app/templates/history/items.php
@@ -1,7 +1,8 @@
 <?php if (empty($items)): ?>
     <p class="alert alert-info"><?php echo t('No history') ?></p>
 <?php else: ?>
-    <?php echo Miniflux\Template\load('search_form') ?>
+    <?php echo Miniflux\Template\load('common/search') ?>
+
     <div class="page-header">
         <h2><?php echo t('History') ?><span id="page-counter"><?php echo isset($nb_items) ? $nb_items : '' ?></span></h2>
         <?php if (!empty($groups)): ?>
@@ -30,7 +31,7 @@
 
     <section class="items" id="listing">
         <?php foreach ($items as $item): ?>
-            <?php echo Miniflux\Template\load('item', array(
+            <?php echo Miniflux\Template\load('items/item', array(
                 'item' => $item,
                 'menu' => $menu,
                 'offset' => $offset,
@@ -42,7 +43,7 @@
             )) ?>
         <?php endforeach ?>
 
-        <?php echo Miniflux\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
+        <?php echo Miniflux\Template\load('items/paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
     </section>
 
 <?php endif ?>
diff --git a/app/templates/show_item.php b/app/templates/item/show.php
similarity index 100%
rename from app/templates/show_item.php
rename to app/templates/item/show.php
diff --git a/app/templates/bookmark_links.php b/app/templates/items/bookmark_links.php
similarity index 100%
rename from app/templates/bookmark_links.php
rename to app/templates/items/bookmark_links.php
diff --git a/app/templates/item.php b/app/templates/items/item.php
similarity index 95%
rename from app/templates/item.php
rename to app/templates/items/item.php
index 39fc042..3556d31 100644
--- a/app/templates/item.php
+++ b/app/templates/items/item.php
@@ -83,8 +83,8 @@
             <?php endif ?>
             </li>
         <?php endif ?>
-        <?php echo Miniflux\Template\load('bookmark_links', array('item' => $item, 'menu' => $menu, 'offset' => $offset)) ?>
-        <?php echo Miniflux\Template\load('status_links', array('item' => $item, 'menu' => $menu, 'offset' => $offset)) ?>
+        <?php echo Miniflux\Template\load('items/bookmark_links', array('item' => $item, 'menu' => $menu, 'offset' => $offset)) ?>
+        <?php echo Miniflux\Template\load('items/status_links', array('item' => $item, 'menu' => $menu, 'offset' => $offset)) ?>
     </ul>
     <?php if ($display_mode === 'full'): ?>
         <div class="preview-full-content" <?php echo Miniflux\Helper\rtl($item) ?>><?php echo $item['content'] ?></div>
diff --git a/app/templates/paging.php b/app/templates/items/paging.php
similarity index 100%
rename from app/templates/paging.php
rename to app/templates/items/paging.php
diff --git a/app/templates/status_links.php b/app/templates/items/status_links.php
similarity index 100%
rename from app/templates/status_links.php
rename to app/templates/items/status_links.php
diff --git a/app/templates/layout.php b/app/templates/layout.php
index 7de008d..28a8fcf 100644
--- a/app/templates/layout.php
+++ b/app/templates/layout.php
@@ -25,49 +25,14 @@
         <script type="text/javascript" src="assets/js/app.min.js?<?php echo filemtime('assets/js/app.min.js') ?>" defer></script>
     </head>
     <body>
-        <header>
-            <nav>
-                <a class="logo" href="?"><?php echo tne('mini%sflux%s','<span>','</span>') ?></a>
-                <ul>
-                    <li<?php echo isset($menu) && $menu === 'unread' ? ' class="active"' : '' ?>>
-                        <a href="?action=unread"><?php echo t('unread') ?><span id="nav-counter"><?php echo empty($nb_unread_items) ? '' : $nb_unread_items ?></span></a>
-                    </li>
-                    <li class="hide-mobile<?php echo isset($menu) && $menu === 'bookmarks' ? ' active' : '' ?>">
-                        <a href="?action=bookmarks"><?php echo t('bookmarks') ?></a>
-                    </li>
-                    <li class="hide-mobile<?php echo isset($menu) && $menu === 'history' ? ' active' : '' ?>">
-                        <a href="?action=history"><?php echo t('history') ?></a>
-                    </li>
-                    <li class="hide-mobile<?php echo isset($menu) && $menu === 'feeds' ? ' active' : '' ?>">
-                        <a href="?action=feeds"><?php echo t('subscriptions') ?></a>
-                    </li>
-                    <li class="hide-mobile<?php echo isset($menu) && $menu === 'config' ? ' active' : '' ?>">
-                        <a href="?action=config"><?php echo t('preferences') ?></a>
-                    </li>
-                    <li class="hide-mobile">
-                        <a href="?action=logout"><?php echo t('logout') ?></a>
-                    </li>
-                    <li class="hide-desktop">
-                        <span data-action="toggle-menu-more" class="menu-more-switcher" href="#">∨ <?php echo t('menu') ?></span>
-                    </li>
-                </ul>
-            </nav>
-        </header>
-        <div id="menu-more" class="hide">
-            <ul>
-                <li<?php echo isset($menu) && $menu === 'unread' ? ' class="active"' : '' ?>><a href="?action=unread"><?= t('unread') ?></a></li>
-                <li<?php echo isset($menu) && $menu === 'bookmarks' ? ' class="active"' : '' ?>><a href="?action=bookmarks"><?= t('bookmarks') ?></a></li>
-                <li<?php echo isset($menu) && $menu === 'history' ? ' class="active"' : '' ?>><a href="?action=history"><?= t('history') ?></a></li>
-                <li<?php echo isset($menu) && $menu === 'feeds' ? ' class="active"' : '' ?>><a href="?action=feeds"><?= t('subscriptions') ?></a></li>
-                <li<?php echo isset($menu) && $menu === 'config' ? ' class="active"' : '' ?>><a href="?action=config"><?= t('preferences') ?></a></li>
-                <li><a href="?action=logout"><?= t('logout') ?></a></li>
-            </ul>
-        </div>
+        <?php echo Miniflux\Template\load('common/menu') ?>
+
         <section class="page" data-item-page="<?= $menu ?>">
             <?php echo Miniflux\Helper\flash('flash_message', '<div class="alert alert-success">%s</div>') ?>
             <?php echo Miniflux\Helper\flash('flash_error_message', '<div class="alert alert-error">%s</div>') ?>
             <?php echo $content_for_layout ?>
         </section>
-        <?php echo Miniflux\Template\load('help_layer') ?>
+
+        <?php echo Miniflux\Template\load('config/help_layer') ?>
     </body>
 </html>
diff --git a/app/templates/search.php b/app/templates/search/items.php
similarity index 69%
rename from app/templates/search.php
rename to app/templates/search/items.php
index 7f0f992..ec3a5ac 100644
--- a/app/templates/search.php
+++ b/app/templates/search/items.php
@@ -1,4 +1,5 @@
-<?php echo Miniflux\Template\load('search_form', array('text' => $text, 'opened' => true)) ?>
+<?php echo Miniflux\Template\load('common/search', array('opened' => true, 'text' => $text)) ?>
+
 <?php if (empty($items)): ?>
     <p class="alert alert-info"><?php echo t('There are no results for your search') ?></p>
 <?php else: ?>
@@ -8,7 +9,7 @@
 
     <section class="items" id="listing">
         <?php foreach ($items as $item): ?>
-            <?php echo Miniflux\Template\load('item', array(
+            <?php echo Miniflux\Template\load('items/item', array(
                 'item' => $item,
                 'menu' => $menu,
                 'offset' => $offset,
@@ -20,7 +21,7 @@
             )) ?>
         <?php endforeach ?>
 
-        <?php echo Miniflux\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'text' => $text)) ?>
+        <?php echo Miniflux\Template\load('items/paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'text' => $text)) ?>
     </section>
 
 <?php endif ?>
diff --git a/app/templates/unread_items.php b/app/templates/unread/items.php
similarity index 84%
rename from app/templates/unread_items.php
rename to app/templates/unread/items.php
index 3f06176..48aa63c 100644
--- a/app/templates/unread_items.php
+++ b/app/templates/unread/items.php
@@ -1,4 +1,4 @@
-<?php echo Miniflux\Template\load('search_form') ?>
+<?php echo Miniflux\Template\load('common/search') ?>
 
 <div class="page-header">
     <h2><?php echo t('Unread') ?><span id="page-counter"><?php echo isset($nb_items) ? $nb_items : '' ?></span></h2>
@@ -29,7 +29,7 @@
         <p class="alert alert-info"><?php echo t('Nothing to read') ?></p>
     <?php else: ?>
         <?php foreach ($items as $item): ?>
-            <?php echo Miniflux\Template\load('item', array(
+            <?php echo Miniflux\Template\load('items/item', array(
                 'item' => $item,
                 'menu' => $menu,
                 'offset' => $offset,
@@ -46,6 +46,6 @@
             <a href="?action=mark-all-read<?php echo $group_id === null ? '' : '&amp;group_id='.$group_id ?>"><?php echo t('mark all as read') ?></a>
         </div>
 
-        <?php echo Miniflux\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
+        <?php echo Miniflux\Template\load('items/paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
     <?php endif ?>
 </section>
diff --git a/app/templates/new_user.php b/app/templates/users/create.php
similarity index 100%
rename from app/templates/new_user.php
rename to app/templates/users/create.php
diff --git a/app/templates/edit_user.php b/app/templates/users/edit.php
similarity index 100%
rename from app/templates/edit_user.php
rename to app/templates/users/edit.php
diff --git a/app/templates/users.php b/app/templates/users/list.php
similarity index 100%
rename from app/templates/users.php
rename to app/templates/users/list.php
diff --git a/app/templates/profile.php b/app/templates/users/profile.php
similarity index 100%
rename from app/templates/profile.php
rename to app/templates/users/profile.php
diff --git a/app/templates/confirm_remove_user.php b/app/templates/users/remove.php
similarity index 100%
rename from app/templates/confirm_remove_user.php
rename to app/templates/users/remove.php