diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite
index a870a75..73e42c6 100644
Binary files a/cms/data/content.sqlite and b/cms/data/content.sqlite differ
diff --git a/cms/data/userdata.sqlite b/cms/data/userdata.sqlite
index 82683ed..80cff56 100644
Binary files a/cms/data/userdata.sqlite and b/cms/data/userdata.sqlite differ
diff --git a/cms/index.php b/cms/index.php
index 753642a..40f9bb2 100644
--- a/cms/index.php
+++ b/cms/index.php
@@ -70,7 +70,7 @@ try
   if(isset($cache) && isset($_GET['clear_cache']) && isset($_SESSION[$settings['session_prefix'].'user_id']))
    {
     $cache->clear();
-    header('Location: index.php?msg=cache_cleared');
+    header('Location: '.BASE_URL);
     exit;
    }
 
diff --git a/cms/templates/admin/subtemplates/admin_index.inc.tpl b/cms/templates/admin/subtemplates/admin_index.inc.tpl
index 47ab5aa..6007838 100644
--- a/cms/templates/admin/subtemplates/admin_index.inc.tpl
+++ b/cms/templates/admin/subtemplates/admin_index.inc.tpl
@@ -20,3 +20,10 @@
                 <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=users"><span class="glyphicon glyphicon-user"></span> <?php if($user_type==1) echo $lang['admin_menu_user_administr']; else echo $lang['admin_menu_edit_userdata']; ?></a></li>
 </ul>
 
+<?php if($settings['caching']): ?>
+<ul class="list-unstyled">
+<li><a href="index.php?clear_cache=true"><span class="glyphicon glyphicon-remove"></span> <?php echo $lang['admin_menu_clear_cache']; ?></a></li>
+</ul>
+<?php endif; ?>
+
+
diff --git a/cms/templates/admin/subtemplates/admin_menu.inc.tpl b/cms/templates/admin/subtemplates/admin_menu.inc.tpl
index f4e5973..0a82bcd 100644
--- a/cms/templates/admin/subtemplates/admin_menu.inc.tpl
+++ b/cms/templates/admin/subtemplates/admin_menu.inc.tpl
@@ -26,6 +26,10 @@
                 <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=filemanager"><span class="glyphicon glyphicon-folder-open"></span> <?php echo $lang['admin_menu_filemanager']; ?></a></li>
                 <?php if($user_type==1): ?><li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=spam_protection"><span class="glyphicon glyphicon-ban-circle"></span> <?php echo $lang['admin_menu_spam_protection']; ?></a></li><?php endif; ?>
                 <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=users"><span class="glyphicon glyphicon-user"></span> <?php if($user_type==1) echo $lang['admin_menu_user_administr']; else echo $lang['admin_menu_edit_userdata']; ?></a></li>
+                <?php if($settings['caching']): ?>
+                <li class="divider"></li>
+                <li><a href="index.php?clear_cache=true"><span class="glyphicon glyphicon-remove"></span> <?php echo $lang['admin_menu_clear_cache']; ?></a></li>
+                <?php endif; ?>
               </ul>
             </li>
           </ul>
diff --git a/cms/templates/admin/subtemplates/edit.inc.tpl b/cms/templates/admin/subtemplates/edit.inc.tpl
index 0c3747c..587fd7c 100644
--- a/cms/templates/admin/subtemplates/edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/edit.inc.tpl
@@ -52,13 +52,6 @@
 </div>
 </div>
 
-<div class="form-group">
-<label for="page_title" class="col-lg-1 control-label control-label-left"><?php echo $lang['edit_page_title_marking']; ?></label>
-<div class="col-lg-11">
-<input id="page_title" type="text" name="page_title" value="<?php if(isset($page_data['page_title'])) echo $page_data['page_title']; ?>" size="50" class="form-control" />
-</div>
-</div>
-
 <?php /*if(!$wysiwyg): ?>
 <div class="form-group">
 <label for="headline" class="col-lg-1 control-label control-label-left"><?php echo $lang['edit_headline_marking']; ?></label>
@@ -141,6 +134,13 @@
 
 <div class="tab-pane fade" id="properties">
 
+<div class="form-group">
+<label for="page_title" class="col-lg-2 control-label"><?php echo $lang['edit_page_title_marking']; ?></label>
+<div class="col-lg-10">
+<input id="page_title" type="text" name="page_title" value="<?php if(isset($page_data['page_title'])) echo $page_data['page_title']; ?>" size="50" class="form-control form-control-inline form-control-default" />
+</div>
+</div>
+
 <div class="form-group">
 <label for="type" class="col-lg-2 control-label"><?php echo $lang['edit_type_marking']; ?></label>
 <div class="col-lg-10">
diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl
index af3911a..0ab97ee 100644
--- a/cms/templates/default.tpl
+++ b/cms/templates/default.tpl
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 <meta charset="<?php echo $lang['charset']; ?>" />
-<title><?php echo $settings['website_title']; if($page_title): ?> - <?php echo $page_title; elseif($title): ?> - <?php echo $title; endif; ?></title>
+<title><?php if($page_title): ?><?php echo $page_title; ?><?php else: ?><?php echo $settings['website_title']; ?><?php if($title): ?> - <?php echo $title; ?><?php endif; ?><?php endif; ?></title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="description" content="">
 <meta name="author" content="">
diff --git a/index.php b/index.php
index c9fa0c6..98db925 100644
--- a/index.php
+++ b/index.php
@@ -177,7 +177,7 @@ try
      {
       if($cache->cacheId && $cache->doCaching)
        {
-        $cache_content = $cache->createCacheContent($template->fetch(BASE_PATH.'templates/'.$template_file), $content_type, CHARSET);
+        $cache_content = $cache->createCacheContent($template->fetch(BASE_PATH.'cms/templates/'.$template_file), $content_type, CHARSET);
         $cache->createChacheFile($cache_content);
        }
      }
diff --git a/static/css/style.css b/static/css/style.css
index dd311c6..2ffba6b 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,7 +1,7 @@
 body             { margin-bottom: 20px; }
 body.admin       {  padding-top: 50px; padding-bottom: 20px;margin-bottom: 20px; }
 
-#logo            { margin:30px 0 15px -20px; font-family:Patua One; font-size:48px; font-weight:bold; transform:rotate(-6deg); }
+#logo            { margin:30px 0 15px -20px; font-family:Patua One; font-size:48px; font-weight:bold; transform:rotate(-6deg); -moz-transform:rotate(-6deg); -webkit-transform:rotate(-6deg); }
 #logo a          { padding:5px; color:#333; text-decoration:none; border:5px solid #333; border-radius:10px; }
 #logo a:hover    { color:#3276b1; border:5px solid #3276b1; }