diff --git a/.htaccess b/.htaccess
index 237b280..55edd20 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,18 @@
+Options -Indexes
+
+<ifModule mod_rewrite.c>
 RewriteEngine On
 RewriteCond $1 !^(css)
 RewriteRule ^([^/]*)/([^/]*)$ /?dir=$1&file=$2 [L]
-AddType text/css .css
\ No newline at end of file
+AddType text/css .css
+</IfModule>
+
+<IfModule mod_headers.c>
+Header always set X-FRAME-OPTIONS "DENY"
+Header set Content-Security-Policy "script-src 'self'"
+</IfModule>
+
+<IfModule mod_expires.c>
+ExpiresActive On
+ExpiresDefault "access plus 1 day"
+</IfModule>
\ No newline at end of file
diff --git a/apps/apps.php b/apps/apps.php
index 5ad3bc1..80a9fff 100644
--- a/apps/apps.php
+++ b/apps/apps.php
@@ -67,9 +67,10 @@ function listFile($dir)
  * @author    Knah Tsaeb <Knah-Tsaeb_mynovi@knah-tsaeb.org>
  * @global
  * @param    string    $getDir    Default: null
+ * @param    bool    $urlRewrite    Default: false
  * @return    string
  */
-function makeMenu($getDir = null)
+function makeMenu($getDir = null, $urlRewrite = false)
 {
     $dirList = listDir();
     $menu    = '';
@@ -77,7 +78,7 @@ function makeMenu($getDir = null)
         if ($getDir === $dir) {
             $expand = 'open';
         } else {
-            $expand = 'close';
+            $expand = '';
         }
         $menu .= '
         <details ' . $expand . '>
@@ -85,7 +86,11 @@ function makeMenu($getDir = null)
             <ul>';
 
         foreach ($files as $value) {
-            $menu .= '<li><a href="/' . urlencode($dir) . '/' . urlencode($value) . '">' . $value . '</a></li>';
+            if($urlRewrite === true){
+                $menu .= '<li><a href="/' . urlencode($dir) . '/' . urlencode($value) . '">' . $value . '</a></li>';
+            } else {
+                $menu .= '<li><a href="?dir=' . urlencode($dir) . '&amp;file=' . urlencode($value) . '">' . $value . '</a></li>';
+            }
         }
         $menu .= '
         </ul>
diff --git a/index.php b/index.php
index c2cd24c..7a9379a 100644
--- a/index.php
+++ b/index.php
@@ -2,6 +2,13 @@
 require 'vendor/autoload.php';
 require 'apps/apps.php';
 
+if (in_array ("mod_rewrite", apache_get_modules()))
+{
+    $urlRewrite = true;
+} else {
+    $urlRewrite = false;
+}
+
 $dir  = $_GET['dir'] ?? '';
 $file = $_GET['file'] ?? '';
 
diff --git a/tpl/aside.html b/tpl/aside.html
index 09db6d0..e8ed521 100644
--- a/tpl/aside.html
+++ b/tpl/aside.html
@@ -1,8 +1,6 @@
 <aside class="menu">
-    <nav role="navigation">
+    <nav>
         <h1>MyNoVi</h1>
-        <p>
-            <?php echo makeMenu($dir); ?>
-        </p>
+            <?php echo makeMenu($dir, $urlRewrite); ?>
     </nav>
-</aside>
\ No newline at end of file
+</aside>
diff --git a/tpl/header.html b/tpl/header.html
index 692c28f..e36f562 100644
--- a/tpl/header.html
+++ b/tpl/header.html
@@ -20,12 +20,16 @@
     <meta name="msapplication-TileColor" content="#da532c">
     <meta name="theme-color" content="#ffffff">
 
+    <meta name="description" content="MyNoVi is personal note viewer.">
+
     <meta property="og:image" content="https://mynovi.knah-tsaeb.org/android-chrome-192x192.png" />
     <meta property="og:image:type" content="image/png" />
     <meta property="og:image:width" content="192" />
     <meta property="og:image:height" content="192" />
     <meta property="og:image:alt" content="Logo" />
+    <meta property="og:title" content="MyNoVi" />
+    <meta property="og:description" content="MyNoVi is personal note viewer." />
 
 </head>
 
-<body>
\ No newline at end of file
+<body>
diff --git a/tpl/main.html b/tpl/main.html
index 04e2d30..a7a901c 100644
--- a/tpl/main.html
+++ b/tpl/main.html
@@ -1,6 +1,8 @@
 <aside class="toc">
     <?php echo $toc;?>
+    
 </aside>
-<main role="main" class="main">
+
+<main class="main">
     <?php echo $body;?>
 </main>
\ No newline at end of file
