diff --git a/assets/css/app.css b/assets/css/app.css
index 1fb2303..df47925 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -664,6 +664,7 @@ iframe {
 
 #login form {
     border: none;
+    margin-bottom: 45px;
 }
 
 /* desktop design */
diff --git a/controllers/config.php b/controllers/config.php
index 6c1c7fd..c80fef2 100644
--- a/controllers/config.php
+++ b/controllers/config.php
@@ -22,7 +22,7 @@ Router\get_action('new-db', function() {
         )));
     }
 
-    Response\redirect('?action=about');
+    Response\redirect('?action=database');
 });
 
 // Create a new database
@@ -43,7 +43,7 @@ Router\post_action('new-db', function() {
                 Session\flash_error(t('Unable to create the new database.'));
             }
 
-            Response\redirect('?action=about');
+            Response\redirect('?action=database');
         }
 
         Response\html(Template\layout('new_db', array(
@@ -54,7 +54,7 @@ Router\post_action('new-db', function() {
         )));
     }
 
-    Response\redirect('?action=about');
+    Response\redirect('?action=database');
 });
 
 // Comfirmation box before auto-update
@@ -99,7 +99,7 @@ Router\get_action('optimize-db', function() {
         Database::get('db')->getConnection()->exec('VACUUM');
     }
 
-    Response\redirect('?action=about');
+    Response\redirect('?action=database');
 });
 
 // Download the compressed database
@@ -181,12 +181,23 @@ Router\get_action('about', function() {
     Response\html(Template\layout('about', array(
         'csrf' => Model\Config\generate_csrf(),
         'config' => Model\Config\get_all(),
-        'db_size' => filesize(\Model\Database\get_path()),
         'menu' => 'config',
         'title' => t('About')
     )));
 });
 
+// Display database page
+Router\get_action('database', function() {
+
+    Response\html(Template\layout('database', array(
+        'csrf' => Model\Config\generate_csrf(),
+        'config' => Model\Config\get_all(),
+        'db_size' => filesize(\Model\Database\get_path()),
+        'menu' => 'config',
+        'title' => t('Database')
+    )));
+});
+
 // Display API page
 Router\get_action('api', function() {
 
diff --git a/docs/multiple-users.markdown b/docs/multiple-users.markdown
index 918140e..3205b73 100644
--- a/docs/multiple-users.markdown
+++ b/docs/multiple-users.markdown
@@ -7,11 +7,10 @@ Each user have his own Sqlite database and people can choose which database they
 
 To create a new database:
 
-1. Go to the page **preferences > about**
-2. Scroll-down to the database section
-3. Click on the link "Add a new database"
-4. Fill the form (db name, the new username and password) and save
-5. If you logout, on the login page you can choose the database you want to use
+1. Go to the page **preferences > database**
+2. Click on the link "Add a new database"
+3. Fill the form (db name, the new username and password) and save
+4. If you logout, on the login page you can choose the database you want to use
 
 If you use the cronjob, to select the database, use the parameter `--database` like that:
 
diff --git a/locales/cs_CZ/translations.php b/locales/cs_CZ/translations.php
index 88f989e..1fa950f 100644
--- a/locales/cs_CZ/translations.php
+++ b/locales/cs_CZ/translations.php
@@ -234,4 +234,5 @@ return array(
     // 'about' => '',
     // 'Link:' => '',
     // 'This action will update Miniflux with the last development version, are you sure?' => '',
+    // 'database' => '',
 );
diff --git a/locales/de_DE/translations.php b/locales/de_DE/translations.php
index 1e195c7..e366b7b 100644
--- a/locales/de_DE/translations.php
+++ b/locales/de_DE/translations.php
@@ -234,4 +234,5 @@ return array(
     // 'about' => '',
     // 'Link:' => '',
     // 'This action will update Miniflux with the last development version, are you sure?' => '',
+    // 'database' => '',
 );
diff --git a/locales/es_ES/translations.php b/locales/es_ES/translations.php
index 64cf7f5..7a92aee 100644
--- a/locales/es_ES/translations.php
+++ b/locales/es_ES/translations.php
@@ -234,4 +234,5 @@ return array(
     // 'about' => '',
     // 'Link:' => '',
     // 'This action will update Miniflux with the last development version, are you sure?' => '',
+    // 'database' => '',
 );
diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php
index 8533da5..60f1d13 100644
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@@ -234,4 +234,5 @@ return array(
     'about' => 'a propos',
     'Link:' => 'Lien :',
     'This action will update Miniflux with the last development version, are you sure?' => 'Cette action va mettre à jour Miniflux avec la dernière version en cours de développement, êtes-vous certain ?',
+    'database' => 'base de données',
 );
diff --git a/locales/it_IT/translations.php b/locales/it_IT/translations.php
index e2c0795..2a28060 100644
--- a/locales/it_IT/translations.php
+++ b/locales/it_IT/translations.php
@@ -234,4 +234,5 @@ return array(
     // 'about' => '',
     // 'Link:' => '',
     // 'This action will update Miniflux with the last development version, are you sure?' => '',
+    // 'database' => '',
 );
diff --git a/locales/pt_BR/translations.php b/locales/pt_BR/translations.php
index d4753c1..1e6378d 100644
--- a/locales/pt_BR/translations.php
+++ b/locales/pt_BR/translations.php
@@ -234,4 +234,5 @@ return array(
     // 'about' => '',
     // 'Link:' => '',
     // 'This action will update Miniflux with the last development version, are you sure?' => '',
+    // 'database' => '',
 );
diff --git a/locales/zh_CN/translations.php b/locales/zh_CN/translations.php
index 0ef9049..0dd25d7 100644
--- a/locales/zh_CN/translations.php
+++ b/locales/zh_CN/translations.php
@@ -234,4 +234,5 @@ return array(
     // 'about' => '',
     // 'Link:' => '',
     // 'This action will update Miniflux with the last development version, are you sure?' => '',
+    // 'database' => '',
 );
diff --git a/templates/about.php b/templates/about.php
index 99bf70b..5fafe60 100644
--- a/templates/about.php
+++ b/templates/about.php
@@ -3,6 +3,7 @@
     <ul>
         <li><a href="?action=config"><?= t('settings') ?></a></li>
         <li><a href="?action=help"><?= t('help') ?></a></li>
+        <li><a href="?action=database"><?= t('database') ?></a></li>
         <li><a href="?action=api"><?= t('api') ?></a></li>
     </ul>
 </div>
@@ -18,19 +19,6 @@
             </li>
         </ul>
     </div>
-    <div class="alert alert-normal">
-        <h3><?= t('Database') ?></h3>
-        <ul>
-            <li><?= t('Database size:') ?> <strong><?= Helper\format_bytes($db_size) ?></strong></li>
-            <li><a href="?action=optimize-db&amp;csrf=<?= $csrf ?>"><?= t('Optimize the database') ?></a> <?= t('(VACUUM command)') ?></li>
-            <li><a href="?action=download-db&amp;csrf=<?= $csrf ?>"><?= t('Download the entire database') ?></a> <?= t('(Gzip compressed Sqlite file)') ?></li>
-            <?php if (ENABLE_MULTIPLE_DB): ?>
-            <li>
-                <a href="?action=new-db"><?= t('Add a new database (new user)') ?></a>
-            </li>
-            <?php endif ?>
-        </ul>
-    </div>
     <div class="alert alert-normal">
         <h3><?= t('About') ?></h3>
         <ul>
diff --git a/templates/api.php b/templates/api.php
index f9a49bd..2df744f 100644
--- a/templates/api.php
+++ b/templates/api.php
@@ -4,6 +4,7 @@
         <li><a href="?action=config"><?= t('settings') ?></a></li>
         <li><a href="?action=about"><?= t('about') ?></a></li>
         <li><a href="?action=help"><?= t('help') ?></a></li>
+        <li><a href="?action=database"><?= t('database') ?></a></li>
     </ul>
 </div>
 <section>
diff --git a/templates/config.php b/templates/config.php
index 1072c37..0326c17 100644
--- a/templates/config.php
+++ b/templates/config.php
@@ -3,6 +3,7 @@
     <ul>
         <li><a href="?action=about"><?= t('about') ?></a></li>
         <li><a href="?action=help"><?= t('help') ?></a></li>
+        <li><a href="?action=database"><?= t('database') ?></a></li>
         <li><a href="?action=api"><?= t('api') ?></a></li>
     </ul>
 </div>
diff --git a/templates/database.php b/templates/database.php
new file mode 100644
index 0000000..0008fb3
--- /dev/null
+++ b/templates/database.php
@@ -0,0 +1,23 @@
+<div class="page-header">
+    <h2><?= t('Database') ?></h2>
+    <ul>
+        <li><a href="?action=about"><?= t('about') ?></a></li>
+        <li><a href="?action=config"><?= t('settings') ?></a></li>
+        <li><a href="?action=help"><?= t('help') ?></a></li>
+        <li><a href="?action=api"><?= t('api') ?></a></li>
+    </ul>
+</div>
+<section>
+    <div class="alert alert-normal">
+        <ul>
+            <li><?= t('Database size:') ?> <strong><?= Helper\format_bytes($db_size) ?></strong></li>
+            <li><a href="?action=optimize-db&amp;csrf=<?= $csrf ?>"><?= t('Optimize the database') ?></a> <?= t('(VACUUM command)') ?></li>
+            <li><a href="?action=download-db&amp;csrf=<?= $csrf ?>"><?= t('Download the entire database') ?></a> <?= t('(Gzip compressed Sqlite file)') ?></li>
+            <?php if (ENABLE_MULTIPLE_DB): ?>
+            <li>
+                <a href="?action=new-db"><?= t('Add a new database (new user)') ?></a>
+            </li>
+            <?php endif ?>
+        </ul>
+    </div>
+</section>
\ No newline at end of file
diff --git a/templates/help.php b/templates/help.php
index fcd8493..d9e415d 100644
--- a/templates/help.php
+++ b/templates/help.php
@@ -3,6 +3,7 @@
     <ul>
         <li><a href="?action=config"><?= t('settings') ?></a></li>
         <li><a href="?action=about"><?= t('about') ?></a></li>
+        <li><a href="?action=database"><?= t('database') ?></a></li>
         <li><a href="?action=api"><?= t('api') ?></a></li>
     </ul>
 </div>
diff --git a/templates/login.php b/templates/login.php
index 5c0e410..2d1480e 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -37,7 +37,7 @@
             </form>
 
             <?php if (ENABLE_MULTIPLE_DB && count($databases) > 1): ?>
-            <div class="alert alert-normal">
+            <div>
                 <h3><?= t('Select another database') ?></h3>
                 <ul>
                     <?php foreach ($databases as $filename => $dbname): ?>