diff --git a/cms/templates/admin/main.tpl b/cms/templates/admin/main.tpl
index 4c1edb9..7d8085f 100644
--- a/cms/templates/admin/main.tpl
+++ b/cms/templates/admin/main.tpl
@@ -1,58 +1,61 @@
 <!DOCTYPE html>
 <html lang="<?php echo $lang['lang']; ?>" dir="<?php echo $lang['dir']; ?>">
 <head>
-<meta charset="<?php echo $lang['charset']; ?>" />
-<title><?php echo $settings['website_title']; ?> - <?php echo $lang['administration']; if(isset($subtitle)) echo ' - ' . $subtitle; ?></title>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="<?php echo $lang['charset']; ?>"/>
+    <title><?php echo $settings['website_title']; ?> - <?php echo $lang['administration'];
+        if (isset($subtitle)) echo ' - ' . $subtitle; ?></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-<link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
-<link href="<?php echo STATIC_URL; ?>css/style_admin.css" rel="stylesheet">
+    <link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
+    <link href="<?php echo STATIC_URL; ?>css/style_admin.css" rel="stylesheet">
 
-<link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png">
+    <link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png">
 </head>
 
 <body>
 
-<?php include(BASE_PATH.'cms/templates/admin/subtemplates/admin_menu.inc.tpl'); ?>
+<?php include(BASE_PATH . 'cms/templates/admin/subtemplates/admin_menu.inc.tpl'); ?>
 
 <div class="container">
 
-<div class="row">
-<div class="col-lg-12">
+    <div class="row">
+        <div class="col-lg-12">
 
-<?php if(isset($subtemplate)): ?>
+            <?php if (isset($subtemplate)): ?>
 
-<?php include(BASE_PATH.'cms/templates/admin/subtemplates/'.$subtemplate); ?>
+                <?php include(BASE_PATH . 'cms/templates/admin/subtemplates/' . $subtemplate); ?>
 
-<?php elseif(isset($content)): ?>
+            <?php elseif (isset($content)): ?>
 
-<?php echo $content; ?>
+                <?php echo $content; ?>
 
-<?php elseif(isset($error_message)): ?>
+            <?php
+            elseif (isset($error_message)): ?>
 
-<p class="caution"><?php echo $error_message; ?></p>
+                <p class="caution"><?php echo $error_message; ?></p>
 
-<?php else: ?>
+            <?php
+            else: ?>
 
-<p class="caution"><?php echo $lang['invalid_request']; ?></p>
+                <p class="caution"><?php echo $lang['invalid_request']; ?></p>
 
-<?php endif; ?>
+            <?php endif; ?>
 
-</div>
-</div>
+        </div>
+    </div>
 
 </div>
 
 <script src="<?php echo JQUERY; ?>"></script>
 <script src="<?php echo JQUERY_UI; ?>"></script>
 <script src="<?php echo BOOTSTRAP; ?>"></script>
-<?php if(isset($wysiwyg)): ?>
-<script src="<?php echo WYSIWYG_EDITOR; ?>"></script>
-<script src="<?php echo WYSIWYG_EDITOR_INIT; ?>"></script>
+<?php if (isset($wysiwyg)): ?>
+    <script src="<?php echo WYSIWYG_EDITOR; ?>"></script>
+    <script src="<?php echo WYSIWYG_EDITOR_INIT; ?>"></script>
 <?php endif; ?>
 <script src="<?php echo STATIC_URL; ?>js/admin_backend.js"></script>
-<?php if($mode=='galleries'): ?>
-<script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>   
+<?php if ($mode == 'galleries'): ?>
+    <script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>
 <?php endif; ?>
 </body>
 </html>
diff --git a/cms/templates/admin/subtemplates/admin_index.inc.tpl b/cms/templates/admin/subtemplates/admin_index.inc.tpl
index 6007838..1a4725e 100644
--- a/cms/templates/admin/subtemplates/admin_index.inc.tpl
+++ b/cms/templates/admin/subtemplates/admin_index.inc.tpl
@@ -1,29 +1,48 @@
 <h1><?php echo $lang['administration']; ?></h1>
 
-<?php if(isset($msg)): ?>
-<p class="ok"><?php if(isset($lang[$msg])) echo $lang[$msg]; else echo $msg; ?></p>
-<?php endif;?>
+<?php if (isset($msg)): ?>
+    <p class="ok"><?php if (isset($lang[$msg])) echo $lang[$msg]; else echo $msg; ?></p>
+<?php endif; ?>
 
 <ul class="list-unstyled">
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=pages"><span class="glyphicon glyphicon-file"></span> <?php echo $lang['admin_menu_page_overview']; ?></a></li>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=edit"><span class="glyphicon glyphicon-plus-sign"></span> <?php echo $lang['admin_menu_new_page']; ?></a></li>
+    <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=pages"><span
+                class="glyphicon glyphicon-file"></span> <?php echo $lang['admin_menu_page_overview']; ?></a></li>
+    <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=edit"><span
+                class="glyphicon glyphicon-plus-sign"></span> <?php echo $lang['admin_menu_new_page']; ?></a></li>
 </ul>
 <ul class="list-unstyled">
-                <?php if($user_type==1): ?><li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=settings"><span class="glyphicon glyphicon-wrench"></span> <?php echo $lang['admin_menu_settings']; ?></a></li><?php endif; ?>
-                <?php if($user_type==1): ?><li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=menus"><span class="glyphicon glyphicon-list-alt"></span> <?php echo $lang['admin_menu_edit_menus']; ?></a></li><?php endif; ?>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=galleries"><span class="glyphicon glyphicon-picture"></span> <?php echo $lang['admin_menu_edit_galleries']; ?></a></li>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=comments"><span class="glyphicon glyphicon-comment"></span> <?php echo $lang['admin_menu_edit_comments']; ?></a></li>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=notes"><span class="glyphicon glyphicon-edit"></span> <?php echo $lang['admin_menu_edit_notes']; ?></a></li>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=gcb"><span class="glyphicon glyphicon-th-large"></span> <?php echo $lang['admin_menu_edit_gcb']; ?></a></li>
-                <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 ($user_type == 1): ?>
+        <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=settings"><span
+                class="glyphicon glyphicon-wrench"></span> <?php echo $lang['admin_menu_settings']; ?></a>
+        </li><?php endif; ?>
+    <?php if ($user_type == 1): ?>
+        <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=menus"><span
+                class="glyphicon glyphicon-list-alt"></span> <?php echo $lang['admin_menu_edit_menus']; ?></a>
+        </li><?php endif; ?>
+    <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=galleries"><span
+                class="glyphicon glyphicon-picture"></span> <?php echo $lang['admin_menu_edit_galleries']; ?></a></li>
+    <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=comments"><span
+                class="glyphicon glyphicon-comment"></span> <?php echo $lang['admin_menu_edit_comments']; ?></a></li>
+    <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=notes"><span
+                class="glyphicon glyphicon-edit"></span> <?php echo $lang['admin_menu_edit_notes']; ?></a></li>
+    <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=gcb"><span
+                class="glyphicon glyphicon-th-large"></span> <?php echo $lang['admin_menu_edit_gcb']; ?></a></li>
+    <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>
 </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 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 909447d..643466a 100644
--- a/cms/templates/admin/subtemplates/admin_menu.inc.tpl
+++ b/cms/templates/admin/subtemplates/admin_menu.inc.tpl
@@ -1,48 +1,84 @@
 <div class="navbar navbar-default navbar-fixed-top">
-      <div class="container">
+    <div class="container">
         <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="<?php echo BASE_URL; ?>"><?php echo $settings['website_title']; ?></a>
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="<?php echo BASE_URL; ?>"><?php echo $settings['website_title']; ?></a>
         </div>
         <div class="navbar-collapse collapse">
-          <?php if($admin): ?>
-          <ul class="nav navbar-nav">
-            <li class="dropdown">
-              <a href="<?php echo BASE_URL; ?>cms/" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-cog"></span> <?php echo $lang['admin_menu_admin']; ?> <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=pages"><span class="glyphicon glyphicon-file"></span> <?php echo $lang['admin_menu_page_overview']; ?></a></li>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=edit"><span class="glyphicon glyphicon-plus-sign"></span> <?php echo $lang['admin_menu_new_page']; ?></a></li>
-                <li class="divider"></li>
-                <?php if($user_type==1): ?><li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=settings"><span class="glyphicon glyphicon-wrench"></span> <?php echo $lang['admin_menu_settings']; ?></a></li><?php endif; ?>
-                <?php if($user_type==1): ?><li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=menus"><span class="glyphicon glyphicon-list-alt"></span> <?php echo $lang['admin_menu_edit_menus']; ?></a></li><?php endif; ?>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=galleries"><span class="glyphicon glyphicon-picture"></span> <?php echo $lang['admin_menu_edit_galleries']; ?></a></li>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=comments"><span class="glyphicon glyphicon-comment"></span> <?php echo $lang['admin_menu_edit_comments']; ?></a></li>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=notes"><span class="glyphicon glyphicon-edit"></span> <?php echo $lang['admin_menu_edit_notes']; ?></a></li>
-                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=gcb"><span class="glyphicon glyphicon-th-large"></span> <?php echo $lang['admin_menu_edit_gcb']; ?></a></li>
-                <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="<?php echo BASE_URL; ?>cms/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>
-          <?php endif; ?>
-          <?php if($admin): ?>
-          <ul class="nav navbar-nav navbar-right">
-           <?php if(defined('PAGE') && $authorized_to_edit): ?>
-           <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=edit&amp;id=<?php echo $id; ?>"><span class="glyphicon glyphicon-pencil"></span> <?php echo $lang['admin_menu_edit_page']; ?></a></li>
-           <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=pages&amp;delete_page=<?php echo $id; ?>" onclick="return confirm_link('<?php echo rawurlencode($lang['admin_menu_delete_page_conf']); ?>',this)"><span class="glyphicon glyphicon-remove"></span> <?php echo $lang['admin_menu_delete_page']; ?></a></li>
-           <?php endif; ?>           
-           <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=logout"><span class="glyphicon glyphicon-off"></span> <?php echo $lang['admin_menu_logout']; ?></a></li>
-          </ul>
-          <?php endif; ?> 
+            <?php if ($admin): ?>
+                <ul class="nav navbar-nav">
+                    <li class="dropdown">
+                        <a href="<?php echo BASE_URL; ?>cms/" class="dropdown-toggle" data-toggle="dropdown"><span
+                                class="glyphicon glyphicon-cog"></span> <?php echo $lang['admin_menu_admin']; ?> <b
+                                class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                            <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=pages"><span
+                                        class="glyphicon glyphicon-file"></span> <?php echo $lang['admin_menu_page_overview']; ?>
+                                </a></li>
+                            <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=edit"><span
+                                        class="glyphicon glyphicon-plus-sign"></span> <?php echo $lang['admin_menu_new_page']; ?>
+                                </a></li>
+                            <li class="divider"></li>
+                            <?php if ($user_type == 1): ?>
+                                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=settings"><span
+                                        class="glyphicon glyphicon-wrench"></span> <?php echo $lang['admin_menu_settings']; ?>
+                                </a></li><?php endif; ?>
+                            <?php if ($user_type == 1): ?>
+                                <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=menus"><span
+                                        class="glyphicon glyphicon-list-alt"></span> <?php echo $lang['admin_menu_edit_menus']; ?>
+                                </a></li><?php endif; ?>
+                            <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=galleries"><span
+                                        class="glyphicon glyphicon-picture"></span> <?php echo $lang['admin_menu_edit_galleries']; ?>
+                                </a></li>
+                            <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=comments"><span
+                                        class="glyphicon glyphicon-comment"></span> <?php echo $lang['admin_menu_edit_comments']; ?>
+                                </a></li>
+                            <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=notes"><span
+                                        class="glyphicon glyphicon-edit"></span> <?php echo $lang['admin_menu_edit_notes']; ?>
+                                </a></li>
+                            <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=gcb"><span
+                                        class="glyphicon glyphicon-th-large"></span> <?php echo $lang['admin_menu_edit_gcb']; ?>
+                                </a></li>
+                            <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="<?php echo BASE_URL; ?>cms/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>
+            <?php endif; ?>
+            <?php if ($admin): ?>
+                <ul class="nav navbar-nav navbar-right">
+                    <?php if (defined('PAGE') && $authorized_to_edit): ?>
+                        <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=edit&amp;id=<?php echo $id; ?>"><span
+                                    class="glyphicon glyphicon-pencil"></span> <?php echo $lang['admin_menu_edit_page']; ?>
+                            </a></li>
+                        <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=pages&amp;delete_page=<?php echo $id; ?>"
+                               onclick="return confirm_link('<?php echo rawurlencode($lang['admin_menu_delete_page_conf']); ?>',this)"><span
+                                    class="glyphicon glyphicon-remove"></span> <?php echo $lang['admin_menu_delete_page']; ?>
+                            </a></li>
+                    <?php endif; ?>
+                    <li><a href="<?php echo BASE_URL; ?>cms/index.php?mode=logout"><span
+                                class="glyphicon glyphicon-off"></span> <?php echo $lang['admin_menu_logout']; ?></a>
+                    </li>
+                </ul>
+            <?php endif; ?>
         </div>
-      </div>
     </div>
+</div>
diff --git a/cms/templates/admin/subtemplates/comments.inc.tpl b/cms/templates/admin/subtemplates/comments.inc.tpl
index da313f1..9ac8bd5 100644
--- a/cms/templates/admin/subtemplates/comments.inc.tpl
+++ b/cms/templates/admin/subtemplates/comments.inc.tpl
@@ -1,22 +1,27 @@
 <div class="row">
-<div class="col-md-10">
-<h1><?php echo $lang['comments']; ?></h1>
-</div>
-<div class="col-md-2">
- <div id="itemnav">
-  <form method="get" action="index.php">
-   <div class="form-group">
-    <input type="hidden" name="mode" value="comments" />
-    <input type="hidden" name="type" value="<?php echo $type; ?>" />
-    <select class="form-control form-control-medium btn-top pull-right" size="1" name="comment_id" onchange="this.form.submit();">
-     <option value="0"><?php if($type==0) echo $lang['comments_all_pages']; else echo $lang['comments_all_photos']; ?></option>
-     <?php foreach($items as $key => $val): ?>
-     <option value="<?php echo $key; ?>"<?php if($key==$comment_id): ?> selected="selected"<?php endif; ?>><?php echo $val['title']; ?></option>
-     <?php endforeach; ?>
-    </select><!--<input type="submit" name="" value="" src="<?php echo BASE_URL; ?>templates/admin/images/submit.png" value="&raquo;" />-->
-   </div>
-  </form>
- </div></div>
+    <div class="col-md-10">
+        <h1><?php echo $lang['comments']; ?></h1>
+    </div>
+    <div class="col-md-2">
+        <div id="itemnav">
+            <form method="get" action="index.php">
+                <div class="form-group">
+                    <input type="hidden" name="mode" value="comments"/>
+                    <input type="hidden" name="type" value="<?php echo $type; ?>"/>
+                    <select class="form-control form-control-medium btn-top pull-right" size="1" name="comment_id"
+                            onchange="this.form.submit();">
+                        <option
+                            value="0"><?php if ($type == 0) echo $lang['comments_all_pages']; else echo $lang['comments_all_photos']; ?></option>
+                        <?php foreach ($items as $key => $val): ?>
+                            <option
+                                value="<?php echo $key; ?>"<?php if ($key == $comment_id): ?> selected="selected"<?php endif; ?>><?php echo $val['title']; ?></option>
+                        <?php endforeach; ?>
+                    </select><!--<input type="submit" name="" value="" src="<?php echo BASE_URL; ?>templates/admin/images/submit.png" value="&raquo;" />
+                    -->
+                </div>
+            </form>
+        </div>
+    </div>
 </div>
 
 <h1></h1>
@@ -29,95 +34,140 @@
  </ul>
 <p>&nbsp;</p>
 </div>
-*/ ?>
+*/
+?>
+
+<?php if (isset($comments)): ?>
+
+    <form id="entryeditform" method="post" action="index.php">
+        <div>
+            <input type="hidden" name="mode" value="comments"/>
 
-<?php if(isset($comments)): ?>
+            <div class="table-responsive">
+                <table class="table table-striped table-hover">
+                    <thead>
+                    <tr>
+                        <th>&nbsp;</th>
+                        <th><?php if ($type == 0) echo $lang['comments_page']; else echo $lang['comments_photo']; ?></th>
+                        <th><?php echo $lang['comments_time']; ?></th>
+                        <th><?php echo $lang['comments_name']; ?></th>
+                        <th><?php echo $lang['comments_comment']; ?></th>
+                        <th><?php echo $lang['comments_ip']; ?></th>
+                        <th colspan="<?php if ($settings['akismet_key'] != '' && $settings['akismet_entry_check'] == 1): ?>3<?php else: ?>2<?php endif; ?>">
+                            &nbsp;</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php $i = 0;
+                    foreach ($comments as $comment): ?>
+                        <tr class="<?php if ($i % 2 == 0): ?>a<?php else: ?>b<?php endif; ?>">
+                            <td><input class="commentcheckbox" type="checkbox" name="checked[]"
+                                       value="<?php echo $comment['id']; ?>"/></td>
+                            <td><?php if ($type == 1): ?><?php if (isset($items[$comment['comment_id']])): ?><a
+                                    href="<?php echo BASE_URL . MEDIA_DIR . $items[$comment['comment_id']]['photo_normal']; ?>">
+                                    <img
+                                        src="<?php echo BASE_URL . MEDIA_DIR . $items[$comment['comment_id']]['photo_thumbnail']; ?>"
+                                        title="<?php echo $items[$comment['comment_id']]['title']; ?>"
+                                        alt="<?php echo $items[$comment['comment_id']]['title']; ?>"
+                                        onclick="image_popup('<?php echo BASE_URL . MEDIA_DIR . $items[$comment['comment_id']]['photo_normal']; ?>'); return false"/>
+                                    </a><?php else: ?>-<?php endif; ?><?php else: ?><?php if (isset($items[$comment['comment_id']])): ?>
+                                    <a
+                                    href="<?php echo BASE_URL . $items[$comment['comment_id']]['page']; ?>#comments"><?php echo $items[$comment['comment_id']]['title']; ?></a><?php else: ?>-<?php endif; ?><?php endif; ?>
+                            </td>
+                            <td><?php echo strftime($lang['time_format'], $comment['time']); ?></td>
+                            <td><?php if (isset($comment['email_hp'])): ?><a
+                                    href="<?php echo $comment['email_hp']; ?>"><?php echo $comment['name']; ?></a><?php else: ?><?php echo $comment['name']; ?><?php endif; ?>
+                            </td>
+                            <td><?php if ($comment['comment'] == '' && $type == 0): ?>
+                                    <em><?php echo $lang['pingback']; ?></em><?php else: echo $comment['comment']; endif; ?>
+                            </td>
+                            <td><?php echo $comment['ip']; ?></td>
+                            <td class="options"><a class="btn btn-primary btn-xs"
+                                                   href="index.php?mode=comments&amp;type=<?php echo $type; ?>&amp;edit=<?php echo $comment['id']; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $page; ?>"
+                                                   title="<?php echo $lang['edit']; ?>"><span
+                                        class="glyphicon glyphicon-pencil"></span></a>
+                                <a class="btn btn-danger btn-xs"
+                                   href="index.php?mode=comments&type=<?php echo $type; ?>&amp;delete=<?php echo $comment['id']; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $page; ?>"
+                                   title="<?php echo $lang['delete']; ?>"
+                                   data-delete-confirm="<?php echo rawurlencode($lang['delete_this_comment_confirm']); ?>"><span
+                                        class="glyphicon glyphicon-remove"></span></a>
+                                <?php if ($settings['akismet_key'] != '' && $settings['akismet_entry_check'] == 1): ?>
+                                    <a class="btn btn-danger btn-xs"
+                                       href="index.php?mode=comments&type=<?php echo $type; ?>&amp;report_spam=<?php echo $comment['id']; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $page; ?>"
+                                       title="<?php echo $lang['report_as_spam']; ?>"><span
+                                            class="glyphicon glyphicon-warning-sign"></span></a>
+                                <?php endif ?></td>
+                        </tr>
+                        <?php $i++; endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
 
-<form id="entryeditform" method="post" action="index.php">
- <div>
-  <input type="hidden" name="mode" value="comments" />
+            <div class="row">
+                <div class="col-md-8">
 
-  <div class="table-responsive">
-  <table class="table table-striped table-hover">
-   <thead>
-   <tr>
-    <th>&nbsp;</th>
-    <th><?php if($type==0) echo $lang['comments_page']; else echo $lang['comments_photo']; ?></th>
-    <th><?php echo $lang['comments_time']; ?></th>
-    <th><?php echo $lang['comments_name']; ?></th>
-    <th><?php echo $lang['comments_comment']; ?></th>
-    <th><?php echo $lang['comments_ip']; ?></th>
-    <th colspan="<?php if($settings['akismet_key']!='' && $settings['akismet_entry_check']==1): ?>3<?php else: ?>2<?php endif; ?>">&nbsp;</th>
-   </tr>
-   </thead>
-   <tbody>
-   <?php $i=0; foreach($comments as $comment): ?>
-   <tr class="<?php if($i%2==0): ?>a<?php else: ?>b<?php endif; ?>">
-    <td><input class="commentcheckbox" type="checkbox" name="checked[]" value="<?php echo $comment['id']; ?>" /></td>
-    <td><?php if($type==1): ?><?php if(isset($items[$comment['comment_id']])): ?><a href="<?php echo BASE_URL.MEDIA_DIR.$items[$comment['comment_id']]['photo_normal']; ?>"><img src="<?php echo BASE_URL.MEDIA_DIR.$items[$comment['comment_id']]['photo_thumbnail']; ?>" title="<?php echo $items[$comment['comment_id']]['title']; ?>" alt="<?php echo $items[$comment['comment_id']]['title']; ?>" onclick="image_popup('<?php echo BASE_URL.MEDIA_DIR.$items[$comment['comment_id']]['photo_normal']; ?>'); return false" /></a><?php else: ?>-<?php endif; ?><?php else: ?><?php if(isset($items[$comment['comment_id']])): ?><a href="<?php echo BASE_URL.$items[$comment['comment_id']]['page']; ?>#comments"><?php echo $items[$comment['comment_id']]['title']; ?></a><?php else: ?>-<?php endif; ?><?php endif; ?></td>
-    <td><?php echo strftime($lang['time_format'], $comment['time']); ?></td>
-    <td><?php if(isset($comment['email_hp'])): ?><a href="<?php echo $comment['email_hp']; ?>"><?php echo $comment['name']; ?></a><?php else: ?><?php echo $comment['name']; ?><?php endif; ?></td>
-    <td><?php if($comment['comment']=='' && $type==0): ?><em><?php echo $lang['pingback']; ?></em><?php else: echo $comment['comment']; endif; ?></td>
-    <td><?php echo $comment['ip']; ?></td>
-    <td class="options"><a class="btn btn-primary btn-xs" href="index.php?mode=comments&amp;type=<?php echo $type; ?>&amp;edit=<?php echo $comment['id']; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $page; ?>" title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
-    <a class="btn btn-danger btn-xs" href="index.php?mode=comments&type=<?php echo $type; ?>&amp;delete=<?php echo $comment['id']; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $page; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_this_comment_confirm']); ?>"><span class="glyphicon glyphicon-remove"></span></a>
-    <?php if($settings['akismet_key']!='' && $settings['akismet_entry_check']==1): ?>
-    <a class="btn btn-danger btn-xs" href="index.php?mode=comments&type=<?php echo $type; ?>&amp;report_spam=<?php echo $comment['id']; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $page; ?>" title="<?php echo $lang['report_as_spam']; ?>"><span class="glyphicon glyphicon-warning-sign"></span></a>
-    <?php endif ?></td>
-   </tr>
-   <?php $i++; endforeach; ?>
-   </tbody>
-  </table>
-  </div>
-  
-  <div class="row">
-  <div class="col-md-8">
+                    <button type="button" class="btn btn-default"
+                            data-toggle-checkboxes="commentcheckbox"><?php echo $lang['toggle_selection']; ?></button>
+                    <input class="btn btn-danger" type="submit" name="delete_checked"
+                           value="<?php echo $lang['comments_del_checked']; ?>"/>
+                    <?php if ($comment_id == 0): ?>
+                        <input class="btn btn-danger" type="submit" name="delete_all_comments"
+                               value="<?php echo $lang['comments_delete_all']; ?>"/>
+                    <?php else: ?>
+                        <?php if ($type == 0): ?>
+                            <input class="btn btn-danger" type="submit" name="delete_all_comments_page"
+                                   value="<?php echo $lang['delete_all_comments_page']; ?>">
+                        <?php else: ?>
+                            <?php echo $lang['delete_all_comments_photo']; ?>
+                            <input class="btn btn-danger" type="submit" name="delete_all_comments_page"
+                                   value="<?php echo $lang['delete_all_comments_photo']; ?>">
+                        <?php endif; ?>
 
-  <button type="button" class="btn btn-default" data-toggle-checkboxes="commentcheckbox"><?php echo $lang['toggle_selection']; ?></button>
-  <input class="btn btn-danger" type="submit" name="delete_checked" value="<?php echo $lang['comments_del_checked']; ?>" />
-  <?php if($comment_id==0): ?>
-  <input class="btn btn-danger" type="submit" name="delete_all_comments" value="<?php echo $lang['comments_delete_all']; ?>" />
-  <?php else: ?>
-  <?php if($type==0): ?>
-  <input class="btn btn-danger" type="submit" name="delete_all_comments_page" value="<?php echo $lang['delete_all_comments_page']; ?>">
-  <?php else: ?>
-  <?php echo $lang['delete_all_comments_photo']; ?>
-  <input class="btn btn-danger" type="submit" name="delete_all_comments_page" value="<?php echo $lang['delete_all_comments_photo']; ?>">
-  <?php endif; ?>
-  
-  <input type="hidden" name="comment_id" value="<?php echo $comment_id; ?>" />
-  <?php endif; ?>
-  <input type="hidden" name="type" value="<?php echo $type; ?>" />
-  <input type="hidden" name="page" value="<?php echo $page; ?>" />
-  </div>
-  
-  <div class="col-md-4">
-  <?php if($pagination): ?> 
-  <ul class="pagination pull-right nomargin"> 
-  <?php if($pagination['previous']): ?><li><a href="index.php?mode=comments&amp;type=<?php echo $type; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $pagination['previous']; ?>"><span class="glyphicon glyphicon-chevron-left"></span></a></li><?php endif; ?>
-  <?php foreach($pagination['items'] as $item): ?>
-  <?php if(empty($item)): ?><li><span>&hellip;</span></li><?php elseif($item==$pagination['current']): ?><li class="active"><span><?php echo $item; ?></span></li><?php else: ?><li><a href="index.php?mode=comments&amp;type=<?php echo $type; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $item; ?>"><?php echo $item; ?></a></li><?php endif; ?>
-  <?php endforeach; ?>
-  <?php if($pagination['next']): ?><li><a href="index.php?mode=comments&amp;type=<?php echo $type; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $pagination['next']; ?>"><span class="glyphicon glyphicon-chevron-right"></span></a></li><?php endif; ?>
-  </ul>
-  <?php endif; ?>  
-  </div>
-  
-  </div>
+                        <input type="hidden" name="comment_id" value="<?php echo $comment_id; ?>"/>
+                    <?php endif; ?>
+                    <input type="hidden" name="type" value="<?php echo $type; ?>"/>
+                    <input type="hidden" name="page" value="<?php echo $page; ?>"/>
+                </div>
 
- </div>
-</form>
+                <div class="col-md-4">
+                    <?php if ($pagination): ?>
+                        <ul class="pagination pull-right nomargin">
+                            <?php if ($pagination['previous']): ?>
+                                <li><a
+                                    href="index.php?mode=comments&amp;type=<?php echo $type; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $pagination['previous']; ?>"><span
+                                        class="glyphicon glyphicon-chevron-left"></span></a></li><?php endif; ?>
+                            <?php foreach ($pagination['items'] as $item): ?>
+                                <?php if (empty($item)): ?>
+                                    <li><span>&hellip;</span></li><?php elseif ($item == $pagination['current']): ?>
+                                    <li class="active"><span><?php echo $item; ?></span></li><?php
+                                else: ?>
+                                    <li><a
+                                        href="index.php?mode=comments&amp;type=<?php echo $type; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $item; ?>"><?php echo $item; ?></a>
+                                    </li><?php endif; ?>
+                            <?php endforeach; ?>
+                            <?php if ($pagination['next']): ?>
+                                <li><a
+                                    href="index.php?mode=comments&amp;type=<?php echo $type; ?>&amp;comment_id=<?php echo $comment_id; ?>&amp;page=<?php echo $pagination['next']; ?>"><span
+                                        class="glyphicon glyphicon-chevron-right"></span></a></li><?php endif; ?>
+                        </ul>
+                    <?php endif; ?>
+                </div>
+
+            </div>
+
+        </div>
+    </form>
 
 
 
 <?php else: ?>
-<div class="alert alert-warning">
-<?php echo $lang['no_comments']; ?>
-</div>
+    <div class="alert alert-warning">
+        <?php echo $lang['no_comments']; ?>
+    </div>
 <?php endif; ?>
 
-<?php if($type==1 && $settings['photos_commentable']==1): ?>
-<p class="small"><?php echo $lang['photo_comments_enabled']; ?></p>
-<?php elseif($type==1 && $settings['photos_commentable']==0): ?>
-<p class="small"><?php echo $lang['photo_comments_disabled']; ?></p>
+<?php if ($type == 1 && $settings['photos_commentable'] == 1): ?>
+    <p class="small"><?php echo $lang['photo_comments_enabled']; ?></p>
+<?php elseif ($type == 1 && $settings['photos_commentable'] == 0): ?>
+    <p class="small"><?php echo $lang['photo_comments_disabled']; ?></p>
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/comments_delete.inc.tpl b/cms/templates/admin/subtemplates/comments_delete.inc.tpl
index e2affad..5119cf8 100644
--- a/cms/templates/admin/subtemplates/comments_delete.inc.tpl
+++ b/cms/templates/admin/subtemplates/comments_delete.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
-<li class="active"><?php echo $lang['delete_comments']; ?></li>
+    <li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
+    <li class="active"><?php echo $lang['delete_comments']; ?></li>
 </ol>
 
 <h1><?php echo $lang['delete_comments']; ?></h1>
@@ -8,19 +8,20 @@
 <p><?php echo $lang['delete_checked_confirm']; ?></p>
 
 <ul>
- <?php foreach($comments as $comment): ?>
- <li><strong><?php echo $comment['name']; ?>:</strong> <?php echo $comment['comment']; ?></li>
- <?php endforeach; ?>
+    <?php foreach ($comments as $comment): ?>
+        <li><strong><?php echo $comment['name']; ?>:</strong> <?php echo $comment['comment']; ?></li>
+    <?php endforeach; ?>
 </ul>
 
 <form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="comments" />
-  <input type="hidden" name="type" value="<?php echo $type; ?>" />
-  <input type="hidden" name="page" value="<?php echo $page; ?>" />
-  <?php foreach($comments as $comment): ?>
-  <input type="hidden" name="checked_ids_confirmed[]" value="<?php echo $comment['id']; ?>" />
-  <?php endforeach; ?>
-  <input class="btn btn-danger btn-lg" type="submit" name="delete_checked_confirmed" value="<?php echo $lang['delete_checked_confirm_subm']; ?>" />
- </div>
+    <div>
+        <input type="hidden" name="mode" value="comments"/>
+        <input type="hidden" name="type" value="<?php echo $type; ?>"/>
+        <input type="hidden" name="page" value="<?php echo $page; ?>"/>
+        <?php foreach ($comments as $comment): ?>
+            <input type="hidden" name="checked_ids_confirmed[]" value="<?php echo $comment['id']; ?>"/>
+        <?php endforeach; ?>
+        <input class="btn btn-danger btn-lg" type="submit" name="delete_checked_confirmed"
+               value="<?php echo $lang['delete_checked_confirm_subm']; ?>"/>
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/comments_delete_all.inc.tpl b/cms/templates/admin/subtemplates/comments_delete_all.inc.tpl
index aa779ea..bf5d3ee 100644
--- a/cms/templates/admin/subtemplates/comments_delete_all.inc.tpl
+++ b/cms/templates/admin/subtemplates/comments_delete_all.inc.tpl
@@ -1,20 +1,21 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
-<li class="active"><?php echo $lang['delete_comments']; ?></li>
+    <li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
+    <li class="active"><?php echo $lang['delete_comments']; ?></li>
 </ol>
 
 <h1><?php echo $lang['delete_comments']; ?></h1>
 
-<?php if($type==0): ?>
-<p><?php echo $lang['delete_all_page_comments']; ?></p>
+<?php if ($type == 0): ?>
+    <p><?php echo $lang['delete_all_page_comments']; ?></p>
 <?php else: ?>
-<p><?php echo $lang['delete_all_photo_comments']; ?></p>
+    <p><?php echo $lang['delete_all_photo_comments']; ?></p>
 <?php endif ?>
 
 <form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="comments" />
-  <input type="hidden" name="type" value="<?php echo $type; ?>" />
-  <input class="btn btn-danger btn-lg" type="submit" name="delete_all_comments_confirmed" value="<?php echo $lang['delete_all_comments_subm']; ?>" />
- </div>
+    <div>
+        <input type="hidden" name="mode" value="comments"/>
+        <input type="hidden" name="type" value="<?php echo $type; ?>"/>
+        <input class="btn btn-danger btn-lg" type="submit" name="delete_all_comments_confirmed"
+               value="<?php echo $lang['delete_all_comments_subm']; ?>"/>
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/comments_delete_all_page.inc.tpl b/cms/templates/admin/subtemplates/comments_delete_all_page.inc.tpl
index 38e1197..a36d4fc 100644
--- a/cms/templates/admin/subtemplates/comments_delete_all_page.inc.tpl
+++ b/cms/templates/admin/subtemplates/comments_delete_all_page.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
-<li class="active"><?php echo $lang['delete_comments']; ?></li>
+    <li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
+    <li class="active"><?php echo $lang['delete_comments']; ?></li>
 </ol>
 
 <h1><?php echo $lang['delete_comments']; ?></h1>
@@ -8,10 +8,11 @@
 <p><?php echo str_replace('[page]', $page, $lang['delete_all_comm_page_conf']); ?></p>
 
 <form action="<?php echo basename($_SERVER['PHP_SELF']); ?>" method="post">
- <div>
-  <input type="hidden" name="mode" value="comments" />
-  <input type="hidden" name="type" value="<?php echo $type; ?>" />
-  <input type="hidden" name="comment_id" value="<?php echo $comment_id; ?>" />
-  <input class="btn btn-danger btn-lg" type="submit" name="delete_all_comments_page_confirmed" value="<?php echo $lang['delete_all_comments_subm']; ?>" />
- </div>
+    <div>
+        <input type="hidden" name="mode" value="comments"/>
+        <input type="hidden" name="type" value="<?php echo $type; ?>"/>
+        <input type="hidden" name="comment_id" value="<?php echo $comment_id; ?>"/>
+        <input class="btn btn-danger btn-lg" type="submit" name="delete_all_comments_page_confirmed"
+               value="<?php echo $lang['delete_all_comments_subm']; ?>"/>
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/comments_edit.inc.tpl b/cms/templates/admin/subtemplates/comments_edit.inc.tpl
index 6408aa1..616e57c 100644
--- a/cms/templates/admin/subtemplates/comments_edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/comments_edit.inc.tpl
@@ -1,36 +1,38 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
-<li class="active"><?php echo $lang['edit_comment']; ?></li>
+    <li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
+    <li class="active"><?php echo $lang['edit_comment']; ?></li>
 </ol>
 
 
 <h1><?php echo $lang['edit_comment']; ?></h1>
 
 <form method="post" action="index.php">
- <div>
-  <input type="hidden" name="mode" value="comments" />
-  <input type="hidden" name="type" value="<?php echo $type; ?>" />
-  <input type="hidden" name="id" value="<?php echo $comment['id']; ?>" />
-  <input type="hidden" name="comment_id" value="<?php echo $comment_id; ?>" />
-  <input type="hidden" name="page" value="<?php echo $page; ?>" />
-  <input type="hidden" name="edit_submit" value="true" />
-  
-  <div class="form-group">
-  <textarea class="form-control" name="comment" cols="60" rows="10"><?php echo $comment['comment']; ?></textarea>
-  </div>
-
-  <div class="form-group">
-  <label for="name"><?php echo $lang['comments_name_m']; ?></label>
-  <input id="name" class="form-control" type="text" name="name" value="<?php echo $comment['name']; ?>" />
-  </div>
-
-  <div class="form-group">
-  <label for="email_hp"><?php echo $lang['comments_email_hp_m']; ?></label>
-  <input id="email_hp" class="form-control" type="text" name="email_hp" value="<?php echo $comment['email_hp']; ?>" />
-  </div>
-
-  <button type="submit" class="btn btn-primary"><?php echo $lang['submit_button_ok']; ?></button>
-
- </div>
+    <div>
+        <input type="hidden" name="mode" value="comments"/>
+        <input type="hidden" name="type" value="<?php echo $type; ?>"/>
+        <input type="hidden" name="id" value="<?php echo $comment['id']; ?>"/>
+        <input type="hidden" name="comment_id" value="<?php echo $comment_id; ?>"/>
+        <input type="hidden" name="page" value="<?php echo $page; ?>"/>
+        <input type="hidden" name="edit_submit" value="true"/>
+
+        <div class="form-group">
+            <textarea class="form-control" name="comment" cols="60"
+                      rows="10"><?php echo $comment['comment']; ?></textarea>
+        </div>
+
+        <div class="form-group">
+            <label for="name"><?php echo $lang['comments_name_m']; ?></label>
+            <input id="name" class="form-control" type="text" name="name" value="<?php echo $comment['name']; ?>"/>
+        </div>
+
+        <div class="form-group">
+            <label for="email_hp"><?php echo $lang['comments_email_hp_m']; ?></label>
+            <input id="email_hp" class="form-control" type="text" name="email_hp"
+                   value="<?php echo $comment['email_hp']; ?>"/>
+        </div>
+
+        <button type="submit" class="btn btn-primary"><?php echo $lang['submit_button_ok']; ?></button>
+
+    </div>
 </form>
 
diff --git a/cms/templates/admin/subtemplates/comments_report_spam.inc.tpl b/cms/templates/admin/subtemplates/comments_report_spam.inc.tpl
index 1bb15d1..9a7967b 100644
--- a/cms/templates/admin/subtemplates/comments_report_spam.inc.tpl
+++ b/cms/templates/admin/subtemplates/comments_report_spam.inc.tpl
@@ -1,6 +1,6 @@
 <ul class="breadcrumb">
-<li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
-<li class="active"><?php echo $lang['report_spam']; ?></li>
+    <li><a href="index.php?mode=comments"><?php echo $lang['comments']; ?></a></li>
+    <li class="active"><?php echo $lang['report_spam']; ?></li>
 </ul>
 
 <h1><?php echo $lang['report_spam']; ?></h1>
@@ -8,18 +8,22 @@
 <p><?php echo $lang['report_spam_confirm']; ?></p>
 
 <div class="panel panel-default">
-<div class="panel-heading"><strong><?php echo $comment['name']; ?>,</strong> <?php echo strftime($lang['time_format'], $comment['time']); ?></div>
-<div class="panel-body"><?php echo $comment['comment']; ?></div>
+    <div class="panel-heading"><strong><?php echo $comment['name']; ?>
+            ,</strong> <?php echo strftime($lang['time_format'], $comment['time']); ?></div>
+    <div class="panel-body"><?php echo $comment['comment']; ?></div>
 </div>
 
 <form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="comments" />
-  <input type="hidden" name="type" value="<?php echo $type; ?>" />
-  <input type="hidden" name="id" value="<?php echo $comment['id']; ?>" />
-  <input type="hidden" name="comment_id" value="<?php echo $comment_id; ?>" />
-  <input type="hidden" name="page" value="<?php echo $page; ?>" />
-  <input class="btn btn-danger" type="submit" name="report_as_spam" value="<?php echo $lang['report_as_spam_submit']; ?>" /> <input class="btn btn-danger" type="submit" name="report_as_spam_and_delete" value="<?php echo $lang['report_as_spam_delete_submit']; ?>" />
- </div>
+    <div>
+        <input type="hidden" name="mode" value="comments"/>
+        <input type="hidden" name="type" value="<?php echo $type; ?>"/>
+        <input type="hidden" name="id" value="<?php echo $comment['id']; ?>"/>
+        <input type="hidden" name="comment_id" value="<?php echo $comment_id; ?>"/>
+        <input type="hidden" name="page" value="<?php echo $page; ?>"/>
+        <input class="btn btn-danger" type="submit" name="report_as_spam"
+               value="<?php echo $lang['report_as_spam_submit']; ?>"/> <input class="btn btn-danger" type="submit"
+                                                                              name="report_as_spam_and_delete"
+                                                                              value="<?php echo $lang['report_as_spam_delete_submit']; ?>"/>
+    </div>
 </form>
 
diff --git a/cms/templates/admin/subtemplates/delete_page.inc.tpl b/cms/templates/admin/subtemplates/delete_page.inc.tpl
index 1f36634..3f41cfb 100644
--- a/cms/templates/admin/subtemplates/delete_page.inc.tpl
+++ b/cms/templates/admin/subtemplates/delete_page.inc.tpl
@@ -1,16 +1,16 @@
 <h1><?php echo $lang['delete_page_headline']; ?></h1>
 
 <div class="alert alert-danger">
-<p><span class="glyphicon glyphicon-warning-sign"></span> <strong><?php echo $lang['caution']; ?></strong></p>
+    <p><span class="glyphicon glyphicon-warning-sign"></span> <strong><?php echo $lang['caution']; ?></strong></p>
 </div>
-<p><?php echo str_replace('[page]',stripslashes($page['page']),$lang['delete_page_confirm']); ?></p>
+<p><?php echo str_replace('[page]', stripslashes($page['page']), $lang['delete_page_confirm']); ?></p>
 
 <form action="index.php" method="post">
-<div>
-<input type="hidden" name="mode" value="pages" />
-<input type="hidden" name="delete_page" value="<?php echo $page['id']; ?>" />
-<input type="hidden" name="confirmed" value="true" />
-<button class="btn btn-danger btn-lg"><?php echo $lang['delete_page_submit']; ?></button>
-</div>
+    <div>
+        <input type="hidden" name="mode" value="pages"/>
+        <input type="hidden" name="delete_page" value="<?php echo $page['id']; ?>"/>
+        <input type="hidden" name="confirmed" value="true"/>
+        <button class="btn btn-danger btn-lg"><?php echo $lang['delete_page_submit']; ?></button>
+    </div>
 </form>
 
diff --git a/cms/templates/admin/subtemplates/edit.inc.tpl b/cms/templates/admin/subtemplates/edit.inc.tpl
index f81c635..9686e83 100644
--- a/cms/templates/admin/subtemplates/edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/edit.inc.tpl
@@ -1,445 +1,578 @@
-<?php if(isset($invalid_request)): ?>
+<?php if (isset($invalid_request)): ?>
 
-<p class="caution"><?php if(isset($lang[$invalid_request])) echo $lang[$invalid_request]; else echo $invalid_request; ?></p>
+    <p class="caution"><?php if (isset($lang[$invalid_request])) echo $lang[$invalid_request]; else echo $invalid_request; ?></p>
 
 <?php else: ?>
 
-<form id="content-form" action="index.php" method="post" class="form-horizontal">
-<div>
-<input type="hidden" name="mode" value="edit" />
-<?php if(isset($page_data['id'])): ?>
-<input type="hidden" name="id" value="<?php echo $page_data['id']; ?>" />
-<?php endif; ?>
-
-<div class="row">
-<div class="col-md-10">
-<?php if(isset($page_data['id'])): ?>
-<h1><?php echo str_replace('[page]','<a href="'.BASE_URL.$page_data['page'].'">'.$page_data['page'].'</a>',$lang['edit_page_headline']); ?></h1>
-<?php else: ?>
-<h1><?php echo $lang['create_new_page_headline']; ?></h1>
-<?php endif; ?>
-</div>
-<div class="col-md-2"><button class="btn btn-lg btn-success btn-top pull-right"><span class="glyphicon glyphicon-save"></span> <?php echo $lang['edit_page_submit']; ?></button></div>
-</div>
-
-<?php include('errors.inc.tpl'); ?>
-
-<ul id="myTab" class="nav nav-tabs">
-<li class="active"><a href="#page-content" data-toggle="tab"><?php echo $lang['content_marking']; ?></a></li>
-<li><a href="#sidebars" data-toggle="tab"><?php echo $lang['sidebars_marking']; ?></a></li>
-<li><a href="#properties" data-toggle="tab"><?php echo $lang['properties_marking']; ?></a></li>
-<li><a href="#include" data-toggle="tab"><?php echo $lang['include_marking']; ?></a></li>
-<li><a href="#notes" data-toggle="tab"><?php echo $lang['page_notes_marking']; ?></a></li>
-</ul>
-
-<div id="myTabContent" class="tab-content">
-<div class="tab-pane active" id="page-content">
-
-<div class="form-group">
-<label for="page" class="col-lg-1 control-label control-label-left"><?php echo $lang['edit_page_name_marking']; ?></label>
-<div class="col-lg-11">
-<div class="input-group">
-<span class="input-group-addon"><?php echo BASE_URL; ?></span>
-<input id="page" type="text" name="page" value="<?php if(isset($page_data['page'])) echo $page_data['page']; ?>" size="50" class="form-control" />
-</div>
-</div>
-</div>
-
-<div class="form-group">
-<label for="title" class="col-lg-1 control-label control-label-left"><?php echo $lang['edit_title_marking']; ?></label>
-<div class="col-lg-11">
-<input id="title" type="text" name="title" value="<?php if(isset($page_data['title'])) echo $page_data['title']; ?>" size="50" class="form-control" />
-</div>
-</div>
-
-<div class="form-group">
-<div class="col-lg-12">
-<label for="content"><?php echo $lang['edit_content_marking']; ?></label>
-
-<?php if(isset($wysiwyg)): ?>
-<a id="wysiwyg-toggle" class="btn btn-default btn-xs active pull-right" href="index.php?mode=edit<?php if(isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;disable_wysiwyg=true" title="<?php echo $lang['disable_wysiwyg_editor']; ?>" data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><?php echo $lang['wysiwyg_label']; ?></a>
-<?php else: ?>
-<a id="wysiwyg-toggle" class="btn btn-default btn-xs pull-right" href="index.php?mode=edit<?php if(isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;enable_wysiwyg=true" title="<?php echo $lang['enable_wysiwyg_editor']; ?>" data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><?php echo $lang['wysiwyg_label']; ?></a>
-<?php endif; ?>
-
-<textarea id="content" name="content" cols="100" rows="28" class="form-control html"><?php if(isset($page_data['content'])) echo $page_data['content']; ?></textarea>
-</div>
-</div>
-
-<?php if(empty($wysiwyg)): ?>
-<div class="form-group">
-<div class="col-lg-12">
-<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_image" data-toggle="modal" data-target="#modal_image" data-insert="#content" title="<?php echo $lang['insert_image_label']; ?>"><span class="glyphicon glyphicon-picture"></span></a>
-<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_thumbnail" data-toggle="modal" data-target="#modal_thumbnail" data-insert="#content" title="<?php echo $lang['insert_thumbnail_label']; ?>"><span class="glyphicon glyphicon-hand-left"></span></a>
-<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_gallery" data-toggle="modal" data-target="#modal_gallery" data-insert="#content" title="<?php echo $lang['insert_gallery_label']; ?>"><span class="glyphicon glyphicon-th"></span></a>
-</div>
-</div>
-<?php endif; ?>
-
-</div>
-
-<div class="tab-pane" id="sidebars">
-
-<div class="form-group">
-<div class="col-lg-12">
-<label for="sidebar_1"><?php echo $lang['edit_sidebar_1_marking']; ?></label>
-<textarea id="sidebar_1" name="sidebar_1" cols="70" rows="13" class="form-control html"><?php if(isset($page_data['sidebar_1'])) echo $page_data['sidebar_1']; ?></textarea>
-</div>
-</div>
-<!--<div class="checkbox">
+    <form id="content-form" action="index.php" method="post" class="form-horizontal">
+    <div>
+    <input type="hidden" name="mode" value="edit"/>
+    <?php if (isset($page_data['id'])): ?>
+        <input type="hidden" name="id" value="<?php echo $page_data['id']; ?>"/>
+    <?php endif; ?>
+
+    <div class="row">
+        <div class="col-md-10">
+            <?php if (isset($page_data['id'])): ?>
+                <h1><?php echo str_replace('[page]', '<a href="' . BASE_URL . $page_data['page'] . '">' . $page_data['page'] . '</a>', $lang['edit_page_headline']); ?></h1>
+            <?php else: ?>
+                <h1><?php echo $lang['create_new_page_headline']; ?></h1>
+            <?php endif; ?>
+        </div>
+        <div class="col-md-2">
+            <button class="btn btn-lg btn-success btn-top pull-right"><span
+                    class="glyphicon glyphicon-save"></span> <?php echo $lang['edit_page_submit']; ?></button>
+        </div>
+    </div>
+
+    <?php include('errors.inc.tpl'); ?>
+
+    <ul id="myTab" class="nav nav-tabs">
+        <li class="active"><a href="#page-content" data-toggle="tab"><?php echo $lang['content_marking']; ?></a></li>
+        <li><a href="#sidebars" data-toggle="tab"><?php echo $lang['sidebars_marking']; ?></a></li>
+        <li><a href="#properties" data-toggle="tab"><?php echo $lang['properties_marking']; ?></a></li>
+        <li><a href="#include" data-toggle="tab"><?php echo $lang['include_marking']; ?></a></li>
+        <li><a href="#notes" data-toggle="tab"><?php echo $lang['page_notes_marking']; ?></a></li>
+    </ul>
+
+    <div id="myTabContent" class="tab-content">
+    <div class="tab-pane active" id="page-content">
+
+        <div class="form-group">
+            <label for="page"
+                   class="col-lg-1 control-label control-label-left"><?php echo $lang['edit_page_name_marking']; ?></label>
+
+            <div class="col-lg-11">
+                <div class="input-group">
+                    <span class="input-group-addon"><?php echo BASE_URL; ?></span>
+                    <input id="page" type="text" name="page"
+                           value="<?php if (isset($page_data['page'])) echo $page_data['page']; ?>" size="50"
+                           class="form-control"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="title"
+                   class="col-lg-1 control-label control-label-left"><?php echo $lang['edit_title_marking']; ?></label>
+
+            <div class="col-lg-11">
+                <input id="title" type="text" name="title"
+                       value="<?php if (isset($page_data['title'])) echo $page_data['title']; ?>" size="50"
+                       class="form-control"/>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-lg-12">
+                <label for="content"><?php echo $lang['edit_content_marking']; ?></label>
+
+                <?php if (isset($wysiwyg)): ?>
+                    <a id="wysiwyg-toggle" class="btn btn-default btn-xs active pull-right"
+                       href="index.php?mode=edit<?php if (isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;disable_wysiwyg=true"
+                       title="<?php echo $lang['disable_wysiwyg_editor']; ?>"
+                       data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><?php echo $lang['wysiwyg_label']; ?></a>
+                <?php else: ?>
+                    <a id="wysiwyg-toggle" class="btn btn-default btn-xs pull-right"
+                       href="index.php?mode=edit<?php if (isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;enable_wysiwyg=true"
+                       title="<?php echo $lang['enable_wysiwyg_editor']; ?>"
+                       data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><?php echo $lang['wysiwyg_label']; ?></a>
+                <?php endif; ?>
+
+                <textarea id="content" name="content" cols="100" rows="28"
+                          class="form-control html"><?php if (isset($page_data['content'])) echo $page_data['content']; ?></textarea>
+            </div>
+        </div>
+
+        <?php if (empty($wysiwyg)): ?>
+            <div class="form-group">
+                <div class="col-lg-12">
+                    <a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_image"
+                       data-toggle="modal" data-target="#modal_image" data-insert="#content"
+                       title="<?php echo $lang['insert_image_label']; ?>"><span
+                            class="glyphicon glyphicon-picture"></span></a>
+                    <a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_thumbnail"
+                       data-toggle="modal" data-target="#modal_thumbnail" data-insert="#content"
+                       title="<?php echo $lang['insert_thumbnail_label']; ?>"><span
+                            class="glyphicon glyphicon-hand-left"></span></a>
+                    <a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_gallery"
+                       data-toggle="modal" data-target="#modal_gallery" data-insert="#content"
+                       title="<?php echo $lang['insert_gallery_label']; ?>"><span class="glyphicon glyphicon-th"></span></a>
+                </div>
+            </div>
+        <?php endif; ?>
+
+    </div>
+
+    <div class="tab-pane" id="sidebars">
+
+        <div class="form-group">
+            <div class="col-lg-12">
+                <label for="sidebar_1"><?php echo $lang['edit_sidebar_1_marking']; ?></label>
+                <textarea id="sidebar_1" name="sidebar_1" cols="70" rows="13"
+                          class="form-control html"><?php if (isset($page_data['sidebar_1'])) echo $page_data['sidebar_1']; ?></textarea>
+            </div>
+        </div>
+        <!--<div class="checkbox">
 <label for="sidebar_1_formatting">
-<input id="sidebar_1_formatting" type="checkbox" name="sidebar_1_formatting" value="1"<?php if(isset($page_data['sidebar_1_formatting']) && $page_data['sidebar_1_formatting']==1): ?> checked="checked"'<?php endif; ?> /> <?php echo $lang['edit_formatting']; ?>
+<input id="sidebar_1_formatting" type="checkbox" name="sidebar_1_formatting" value="1"<?php if (isset($page_data['sidebar_1_formatting']) && $page_data['sidebar_1_formatting'] == 1): ?> checked="checked"'<?php endif; ?> /> <?php echo $lang['edit_formatting']; ?>
 </label>
 </div>-->
 
-<div class="form-group">
-<div class="col-lg-12">
-<label for="sidebar_2"><?php echo $lang['edit_sidebar_2_marking']; ?></label>
-<textarea id="sidebar_2" name="sidebar_2" cols="70" rows="13" class="form-control html"><?php if(isset($page_data['sidebar_1'])) echo $page_data['sidebar_2']; ?></textarea>
-</div>
-</div>
-
-<div class="form-group">
-<div class="col-lg-12">
-<label for="sidebar_3"><?php echo $lang['edit_sidebar_3_marking']; ?></label>
-<textarea id="sidebar_3" name="sidebar_3" cols="70" rows="13" class="form-control html"><?php if(isset($page_data['sidebar_1'])) echo $page_data['sidebar_3']; ?></textarea>
-</div>
-</div>
-
-</div>
-
-<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">
-<select id="type" name="type" size="1" class="form-control form-control-inline form-control-default">
-<?php foreach($page_types as $key => $val): ?>
-<option value="<?php echo $key; ?>"<?php if(isset($page_data['type']) && $page_data['type']==$key): ?> selected="selected"<?php endif; ?>><?php if(isset($lang[$val['page_type_label']])) echo $lang[$val['page_type_label']]; else echo $val['page_type_label']; ?></option>
-<?php endforeach; ?>
-</select>
-<input type="text" name="type_addition" value="<?php if(isset($page_data['type_addition'])) echo $page_data['type_addition']; ?>" placeholder="<?php echo $lang['edit_type_addition_marking']; ?>" size="40" class="form-control form-control-inline form-control-medium" />
-</div>
-</div>
-
-<div class="form-group">
-<label for="time" class="col-lg-2 control-label"><?php echo $lang['edit_time_marking']; ?></label>
-<div class="col-lg-10">
-<input id="time" type="text" name="time" value="<?php if(isset($page_data['time'])) echo $page_data['time']; ?>" placeholder="<?php echo $lang['edit_time_format']; ?>" size="20" class="form-control form-control-inline form-control-default" />
-</div>
-</div>
-
-<div class="form-group">
-<label for="last_modified" class="col-lg-2 control-label"><?php echo $lang['edit_last_modified_marking']; ?></label>
-<div class="col-lg-10">
-<input id="last_modified" type="text" name="last_modified" value="<?php if(isset($page_data['last_modified'])) echo $page_data['last_modified']; ?>" placeholder="<?php echo $lang['edit_time_format']; ?>" size="20" class="form-control form-control-inline form-control-default" />
-
-
-<div class="checkbox">
-<label for="display_time">
-<input type="checkbox" id="display_time" name="display_time" value="1"<?php if(isset($page_data['display_time'])&&$page_data['display_time']==1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_display_time_label']; ?>
-</label>
-</div>
-</div>
-</div>
-
-<div class="form-group">
-<label for="menu_1" class="col-lg-2 control-label"><?php echo $lang['edit_menus_marking']; ?></label>
-<div class="col-lg-10">
-      <select id="menu_1" name="menu_1" size="1" class="form-control form-control-inline form-control-medium">
-       <option value="">#1</option>
-       <?php if(isset($menus)): ?>
-       <?php foreach($menus as $menu): ?>
-       <option value="<?php echo $menu; ?>"<?php if(isset($page_data['menu_1']) && $page_data['menu_1']==$menu): ?> selected="selected"<?php endif; ?>><?php echo $menu; ?></option>
-       <?php endforeach;?>
-       <?php endif; ?>
-      </select>
-      <select name="menu_2" size="1" class="form-control form-control-inline form-control-medium">
-       <option value="">#2</option>
-       <?php if(isset($menus)): ?>
-       <?php foreach($menus as $menu): ?>
-       <option value="<?php echo $menu; ?>"<?php if(isset($page_data['menu_2']) && $page_data['menu_2']==$menu): ?> selected="selected"<?php endif; ?>><?php echo $menu; ?></option>
-       <?php endforeach;?>
-       <?php endif; ?>
-      </select>
-      <select name="menu_3" size="1" class="form-control form-control-inline form-control-medium">
-       <option value="">#3</option>
-       <?php if(isset($menus)): ?>
-       <?php foreach($menus as $menu): ?>
-       <option value="<?php echo $menu; ?>"<?php if(isset($page_data['menu_3']) && $page_data['menu_3']==$menu): ?> selected="selected"<?php endif; ?>><?php echo $menu; ?></option>
-       <?php endforeach;?>
-       <?php endif; ?>
-      </select>
-</div>
-</div>
-    
-<div class="form-group">
-<label for="menu_1" class="col-lg-2 control-label"><?php echo $lang['edit_sections_marking']; ?></label>
-<div class="col-lg-10">
-<input id="sections" type="text" name="sections" value="<?php if(isset($page_data['sections'])) echo $page_data['sections']; ?>" placeholder="<?php echo $lang['values_comma_separated']; ?>" size="40" class="form-control form-control-inline form-control-default" />
-</div>
-</div>
-
-<div class="form-group">
-<label for="breadcrumbs_0" class="col-lg-2 control-label"><?php echo $lang['breadcrumbs']; ?></label>
-<div class="col-lg-10">
-      <?php for($i=0;$i<$settings['breadcrumbs'];++$i): ?>
-      <select id="breadcrumbs_<?php echo $i; ?>" name="breadcrumbs[]" size="1" class="form-control form-control-inline form-control-small">
-       <option value=""<?php if(empty($page_data['breadcrumbs'][$i])): ?> selected="selected"<?php endif; ?>>&nbsp;</option>
-       <?php foreach($pages as $breadcrumb_page): ?>
-       <option value="<?php echo $breadcrumb_page['id']; ?>"<?php if(isset($page_data['breadcrumbs'][$i]) && $page_data['breadcrumbs'][$i]==$breadcrumb_page['id']): ?> selected="selected"<?php endif; ?>><?php echo $breadcrumb_page['page']; ?></option>
-       <?php endforeach; ?>
-      </select>
-      <?php if($i<$settings['breadcrumbs']-1): ?> &raquo; <?php endif; ?>
-      <?php endfor; ?>
-</div>
-</div>
-
-<div class="form-group">
-<label for="description" class="col-lg-2 control-label"><?php echo $lang['edit_description_marking']; ?></label>
-<div class="col-lg-10">
-<input id="description" type="text" name="description" value="<?php if(isset($page_data['description'])) echo $page_data['description']; ?>" size="60" class="form-control form-control-large" />
-</div>
-</div>
-
-<div class="form-group">
-<label for="keywords" class="col-lg-2 control-label"><?php echo $lang['edit_keywords_marking']; ?></label>
-<div class="col-lg-10">
-<input id="keywords" type="text" name="keywords" value="<?php if(isset($page_data['keywords'])) echo $page_data['keywords']; ?>" placeholder="<?php echo $lang['values_comma_separated']; ?>" size="60" class="form-control form-control-large" />
-</div>
-</div>
-
-<div class="form-group">
-<label for="page_info" class="col-lg-2 control-label"><?php echo $lang['edit_page_info_marking']; ?></label>
-<div class="col-lg-10">
-<input id="page_info" type="text" name="page_info" value="<?php if(isset($page_data['page_info'])) echo $page_data['page_info']; ?>" size="60" class="form-control form-control-default" />
-</div>
-</div>
-
-<div class="form-group">
-<label for="gcb_1" class="col-lg-2 control-label"><?php echo $lang['edit_gcb_marking']; ?></label>
-<div class="col-lg-10">
-      <select id="gcb_1" name="gcb_1" size="1" class="form-control form-control-inline form-control-medium">
-       <option value="">#1</option>
-       <?php if(isset($gcbs)): ?>
-       <?php foreach($gcbs as $gcb): ?>
-       <option value="<?php echo $gcb['identifier']; ?>"<?php if(isset($page_data['gcb_1']) && $page_data['gcb_1']==$gcb['identifier']): ?> selected<?php endif; ?>><?php echo $gcb['identifier']; ?></option>
-       <?php endforeach ?>
-       <?php endif; ?>
-      </select>
-      <select name="gcb_2" size="1" class="form-control form-control-inline form-control-medium">
-       <option value="">#2</option>
-       <?php if(isset($gcbs)): ?>
-       <?php foreach($gcbs as $gcb): ?>
-       <option value="<?php echo $gcb['identifier']; ?>"<?php if(isset($page_data['gcb_2']) && $page_data['gcb_2']==$gcb['identifier']): ?> selected<?php endif; ?>><?php echo $gcb['identifier']; ?></option>
-       <?php endforeach ?>
-       <?php endif; ?>
-      </select>
-      <select name="gcb_3" size="1" class="form-control form-control-inline form-control-medium">
-       <option value="">#3</option>
-       <?php if(isset($gcbs)): foreach($gcbs as $gcb): ?>
-       <option value="<?php echo $gcb['identifier']; ?>"<?php if(isset($page_data['gcb_3']) && $page_data['gcb_3']==$gcb['identifier']): ?> selected<?php endif; ?>><?php echo $gcb['identifier']; ?></option>
-       <?php endforeach; endif; ?>
-      </select>
-</div>
-</div>
-
-<div class="form-group">
-<label for="template" class="col-lg-2 control-label"><?php echo $lang['edit_template_marking']; ?></label>
-<div class="col-lg-10">
-<select id="template" name="template" size="1" class="form-control form-control-default">
-<?php if(isset($template_files)): foreach($template_files as $template_file): ?>
-<option value="<?php echo $template_file; ?>"<?php if($page_data['template']==$template_file): ?> selected="selected"<?php endif; ?>> <?php echo $template_file; ?></option>
-<?php endforeach; endif; ?>
-</select>
-</div>
-</div>
-
-<div class="form-group">
-<label for="language" class="col-lg-2 control-label"><?php echo $lang['page_language']; ?></label>
-<div class="col-lg-10">
-      <select id="language" name="language" size="1" class="form-control form-control-default">
-       <option value=""<?php if(empty($page_data['language'])): ?> selected="selected"<?php endif; ?>><?php echo $lang['page_language_default']; ?></option>
-       <?php if(isset($page_languages)): foreach($page_languages as $page_language): ?>
-       <option value="<?php echo $page_language['identifier']; ?>"<?php if(isset($page_data['language']) && $page_data['language']==$page_language['identifier']): ?> selected="selected"<?php endif; ?>> <?php echo $page_language['name']; ?></option>
-       <?php endforeach; endif; ?>
-      </select>
-</div>
-</div>
-
-<div class="form-group">
-<label for="content_type" class="col-lg-2 control-label"><?php echo $lang['page_content_type']; ?></label>
-<div class="col-lg-10">
-<input id="content_type" type="text" name="content_type" value="<?php if(isset($page_data['content_type'])) echo $page_data['content_type']; ?>" placeholder="<?php echo $lang['page_content_type_exp']; ?>" size="20" class="form-control form-control-default" />
-</div>
-</div>
-
-<div class="form-group">
-<label for="tv" class="col-lg-2 control-label"><?php echo $lang['template_variables']; ?></label>
-<div class="col-lg-10">
-<input type="text" id="tv" name="tv" value="<?php if(isset($page_data['tv'])) echo $page_data['tv']; ?>" placeholder="<?php echo $lang['values_comma_separated']; ?>" class="form-control form-control-default" size="40" />
-</div>
-</div>
-
-<div class="form-group">
-<label for="edit_permission" class="col-lg-2 control-label"><?php echo $lang['edit_permission']; ?></label>
-<div class="col-lg-10">
-<input type="text" id="edit_permission" name="edit_permission" value="<?php if(isset($page_data['edit_permission'])) echo $page_data['edit_permission']; ?>" placeholder="<?php echo $lang['values_comma_separated']; ?>" class="form-control form-control-default" size="40" />
-<div class="checkbox">
-<label for="edit_permission_general">
-<input id="edit_permission_general" type="checkbox" name="edit_permission_general" value="1"<?php if(isset($page_data['edit_permission_general']) && $page_data['edit_permission_general']==1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_permission_general']; ?>
-</label>
-</div>
-</div>
-</div>
-
-
-<div class="form-group">
-<strong class="col-lg-2 control-label"><?php echo $lang['status']; ?></strong>
-<div class="col-lg-10">
-<div class="radio">
-<label for="status_2"><input id="status_2" type="radio" name="status" value="2"<?php if(isset($page_data['status']) && $page_data['status']==2): ?> checked="checked"<?php endif; ?> /><?php echo $lang['status_published_searchable']; ?></label><br />
-<label for="status_1"><input id="status_1" type="radio" name="status" value="1"<?php if(isset($page_data['status']) && $page_data['status']==1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['status_published']; ?></label><br />
-<label for="status_0"><input id="status_0" type="radio" name="status" value="0"<?php if(isset($page_data['status']) && $page_data['status']==0): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['status_draft']; ?></label>
-</div>
-</div>
-</div>
-
-</div>
-
-
-<div class="tab-pane fade" id="include">
-
-
-<div class="form-group">
-<label for="include_page" class="col-lg-2 control-label"><?php echo $lang['edit_include_in_marking']; ?></label>
-<div class="col-lg-10">
-<select id="include_page" name="include_page" size="1" class="form-control form-control-inline form-control-medium">
-       <option value=""<?php if(empty($page_data['include_page'])): ?> selected="selected"<?php endif; ?>><?php echo $lang['edit_include_page_marking']; ?></option>
-       <?php foreach($pages as $include_page): if($include_page['type']=='overview' || $include_page['type']=='news'): ?>
-       <option value="<?php echo $include_page['id']; ?>"<?php if(isset($page_data['include_page']) && $page_data['include_page']==$include_page['id']): ?> selected="selected"<?php endif; ?>><?php echo $include_page['page']; ?></option>
-       <?php endif; endforeach; ?>
-      </select> 
-      <select name="include_rss" size="1" class="form-control form-control-inline form-control-medium">
-       <option value=""<?php if(empty($page_data['include_rss'])): ?> selected="selected"<?php endif; ?>><?php echo $lang['edit_include_rss_marking']; ?></option>
-       <?php foreach($pages as $include_rss): if($include_rss['type']=='rss'): ?>
-       <option value="<?php echo $include_rss['id']; ?>"<?php if(isset($page_data['include_rss']) && $page_data['include_rss']==$include_rss['id']): ?> selected="selected"<?php endif; ?>><?php echo $include_rss['page']; ?></option>
-       <?php endif; endforeach; ?>
-      </select> 
-      <select name="include_sitemap" size="1" class="form-control form-control-inline form-control-medium">
-       <option value=""<?php if(empty($page_data['include_sitemap'])): ?> selected="selected"<?php endif; ?>><?php echo $lang['edit_include_sitemap_marking']; ?></option>
-       <?php foreach($pages as $include_sitemap): if($include_sitemap['type']=='sitemap'): ?>
-       <option value="<?php echo $include_sitemap['id']; ?>"<?php if(isset($page_data['include_sitemap']) && $page_data['include_sitemap']==$include_sitemap['id']): ?> selected="selected"<?php endif; ?>><?php echo $include_sitemap['page']; ?></option>
-       <?php endif; endforeach; ?>
-      </select>
-</div>
-</div>
-
-<div class="form-group">
-<label for="include_order" class="col-lg-2 control-label"><?php echo $lang['edit_order_number_marking']; ?></label>
-<div class="col-lg-9">
-<input type="text" id="include_order" name="include_order" value="<?php echo $page_data['include_order']; ?>" size="35" class="form-control form-control-small">
-</div>
-</div>
-
-<div class="form-group">
-<label for="teaser_headline" class="col-lg-2 control-label"><?php echo $lang['edit_teaser_headline_marking']; ?></label>
-<div class="col-lg-9">
-<input type="text" id="teaser_headline" name="teaser_headline" value="<?php if(isset($page_data['teaser_headline'])): ?><?php echo $page_data['teaser_headline']; ?><?php endif; ?>" size="35" class="form-control">
-</div>
-</div>
-
-<div class="form-group">
-<label for="teaser" class="col-lg-2 control-label"><?php echo $lang['edit_teaser_marking']; ?></label>
-<div class="col-lg-9">
-<textarea id="teaser" name="teaser" cols="75" rows="13" class="form-control"><?php if(isset($page_data['teaser'])) echo $page_data['teaser']; ?></textarea>
-</div>
-</div>
-
-<div class="form-group">
-<label for="link_name" class="col-lg-2 control-label"><?php echo $lang['edit_include_link']; ?></label>
-<div class="col-lg-9">
-<input type="text" id="link_name" name="link_name" value="<?php if(isset($page_data['link_name'])) echo $page_data['link_name']; ?>" size="35" class="form-control">
-</div>
-</div>
-
-<div class="form-group">
-<label for="teaser_img" class="col-lg-2 control-label"><?php echo $lang['edit_teaser_img_marking']; ?></label>
-<div class="col-lg-9">
-<div class="input-group">
-<input type="text" id="teaser_img" name="teaser_img" value="<?php if(isset($page_data['teaser_img'])) echo $page_data['teaser_img']; ?>" size="35" class="form-control">
+        <div class="form-group">
+            <div class="col-lg-12">
+                <label for="sidebar_2"><?php echo $lang['edit_sidebar_2_marking']; ?></label>
+                <textarea id="sidebar_2" name="sidebar_2" cols="70" rows="13"
+                          class="form-control html"><?php if (isset($page_data['sidebar_1'])) echo $page_data['sidebar_2']; ?></textarea>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-lg-12">
+                <label for="sidebar_3"><?php echo $lang['edit_sidebar_3_marking']; ?></label>
+                <textarea id="sidebar_3" name="sidebar_3" cols="70" rows="13"
+                          class="form-control html"><?php if (isset($page_data['sidebar_1'])) echo $page_data['sidebar_3']; ?></textarea>
+            </div>
+        </div>
+
+    </div>
+
+    <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">
+            <select id="type" name="type" size="1" class="form-control form-control-inline form-control-default">
+                <?php foreach ($page_types as $key => $val): ?>
+                    <option
+                        value="<?php echo $key; ?>"<?php if (isset($page_data['type']) && $page_data['type'] == $key): ?> selected="selected"<?php endif; ?>><?php if (isset($lang[$val['page_type_label']])) echo $lang[$val['page_type_label']]; else echo $val['page_type_label']; ?></option>
+                <?php endforeach; ?>
+            </select>
+            <input type="text" name="type_addition"
+                   value="<?php if (isset($page_data['type_addition'])) echo $page_data['type_addition']; ?>"
+                   placeholder="<?php echo $lang['edit_type_addition_marking']; ?>" size="40"
+                   class="form-control form-control-inline form-control-medium"/>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="time" class="col-lg-2 control-label"><?php echo $lang['edit_time_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <input id="time" type="text" name="time"
+                   value="<?php if (isset($page_data['time'])) echo $page_data['time']; ?>"
+                   placeholder="<?php echo $lang['edit_time_format']; ?>" size="20"
+                   class="form-control form-control-inline form-control-default"/>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="last_modified"
+               class="col-lg-2 control-label"><?php echo $lang['edit_last_modified_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <input id="last_modified" type="text" name="last_modified"
+                   value="<?php if (isset($page_data['last_modified'])) echo $page_data['last_modified']; ?>"
+                   placeholder="<?php echo $lang['edit_time_format']; ?>" size="20"
+                   class="form-control form-control-inline form-control-default"/>
+
+
+            <div class="checkbox">
+                <label for="display_time">
+                    <input type="checkbox" id="display_time" name="display_time"
+                           value="1"<?php if (isset($page_data['display_time']) && $page_data['display_time'] == 1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_display_time_label']; ?>
+                </label>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="menu_1" class="col-lg-2 control-label"><?php echo $lang['edit_menus_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <select id="menu_1" name="menu_1" size="1" class="form-control form-control-inline form-control-medium">
+                <option value="">#1</option>
+                <?php if (isset($menus)): ?>
+                    <?php foreach ($menus as $menu): ?>
+                        <option
+                            value="<?php echo $menu; ?>"<?php if (isset($page_data['menu_1']) && $page_data['menu_1'] == $menu): ?> selected="selected"<?php endif; ?>><?php echo $menu; ?></option>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+            </select>
+            <select name="menu_2" size="1" class="form-control form-control-inline form-control-medium">
+                <option value="">#2</option>
+                <?php if (isset($menus)): ?>
+                    <?php foreach ($menus as $menu): ?>
+                        <option
+                            value="<?php echo $menu; ?>"<?php if (isset($page_data['menu_2']) && $page_data['menu_2'] == $menu): ?> selected="selected"<?php endif; ?>><?php echo $menu; ?></option>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+            </select>
+            <select name="menu_3" size="1" class="form-control form-control-inline form-control-medium">
+                <option value="">#3</option>
+                <?php if (isset($menus)): ?>
+                    <?php foreach ($menus as $menu): ?>
+                        <option
+                            value="<?php echo $menu; ?>"<?php if (isset($page_data['menu_3']) && $page_data['menu_3'] == $menu): ?> selected="selected"<?php endif; ?>><?php echo $menu; ?></option>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="menu_1" class="col-lg-2 control-label"><?php echo $lang['edit_sections_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <input id="sections" type="text" name="sections"
+                   value="<?php if (isset($page_data['sections'])) echo $page_data['sections']; ?>"
+                   placeholder="<?php echo $lang['values_comma_separated']; ?>" size="40"
+                   class="form-control form-control-inline form-control-default"/>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="breadcrumbs_0" class="col-lg-2 control-label"><?php echo $lang['breadcrumbs']; ?></label>
+
+        <div class="col-lg-10">
+            <?php for ($i = 0; $i < $settings['breadcrumbs']; ++$i): ?>
+                <select id="breadcrumbs_<?php echo $i; ?>" name="breadcrumbs[]" size="1"
+                        class="form-control form-control-inline form-control-small">
+                    <option
+                        value=""<?php if (empty($page_data['breadcrumbs'][$i])): ?> selected="selected"<?php endif; ?>>
+                        &nbsp;</option>
+                    <?php foreach ($pages as $breadcrumb_page): ?>
+                        <option
+                            value="<?php echo $breadcrumb_page['id']; ?>"<?php if (isset($page_data['breadcrumbs'][$i]) && $page_data['breadcrumbs'][$i] == $breadcrumb_page['id']): ?> selected="selected"<?php endif; ?>><?php echo $breadcrumb_page['page']; ?></option>
+                    <?php endforeach; ?>
+                </select>
+                <?php if ($i < $settings['breadcrumbs'] - 1): ?> &raquo; <?php endif; ?>
+            <?php endfor; ?>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="description" class="col-lg-2 control-label"><?php echo $lang['edit_description_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <input id="description" type="text" name="description"
+                   value="<?php if (isset($page_data['description'])) echo $page_data['description']; ?>" size="60"
+                   class="form-control form-control-large"/>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="keywords" class="col-lg-2 control-label"><?php echo $lang['edit_keywords_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <input id="keywords" type="text" name="keywords"
+                   value="<?php if (isset($page_data['keywords'])) echo $page_data['keywords']; ?>"
+                   placeholder="<?php echo $lang['values_comma_separated']; ?>" size="60"
+                   class="form-control form-control-large"/>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="page_info" class="col-lg-2 control-label"><?php echo $lang['edit_page_info_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <input id="page_info" type="text" name="page_info"
+                   value="<?php if (isset($page_data['page_info'])) echo $page_data['page_info']; ?>" size="60"
+                   class="form-control form-control-default"/>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="gcb_1" class="col-lg-2 control-label"><?php echo $lang['edit_gcb_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <select id="gcb_1" name="gcb_1" size="1" class="form-control form-control-inline form-control-medium">
+                <option value="">#1</option>
+                <?php if (isset($gcbs)): ?>
+                    <?php foreach ($gcbs as $gcb): ?>
+                        <option
+                            value="<?php echo $gcb['identifier']; ?>"<?php if (isset($page_data['gcb_1']) && $page_data['gcb_1'] == $gcb['identifier']): ?> selected<?php endif; ?>><?php echo $gcb['identifier']; ?></option>
+                    <?php endforeach ?>
+                <?php endif; ?>
+            </select>
+            <select name="gcb_2" size="1" class="form-control form-control-inline form-control-medium">
+                <option value="">#2</option>
+                <?php if (isset($gcbs)): ?>
+                    <?php foreach ($gcbs as $gcb): ?>
+                        <option
+                            value="<?php echo $gcb['identifier']; ?>"<?php if (isset($page_data['gcb_2']) && $page_data['gcb_2'] == $gcb['identifier']): ?> selected<?php endif; ?>><?php echo $gcb['identifier']; ?></option>
+                    <?php endforeach ?>
+                <?php endif; ?>
+            </select>
+            <select name="gcb_3" size="1" class="form-control form-control-inline form-control-medium">
+                <option value="">#3</option>
+                <?php if (isset($gcbs)): foreach ($gcbs as $gcb): ?>
+                    <option
+                        value="<?php echo $gcb['identifier']; ?>"<?php if (isset($page_data['gcb_3']) && $page_data['gcb_3'] == $gcb['identifier']): ?> selected<?php endif; ?>><?php echo $gcb['identifier']; ?></option>
+                <?php endforeach; endif; ?>
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="template" class="col-lg-2 control-label"><?php echo $lang['edit_template_marking']; ?></label>
+
+        <div class="col-lg-10">
+            <select id="template" name="template" size="1" class="form-control form-control-default">
+                <?php if (isset($template_files)): foreach ($template_files as $template_file): ?>
+                    <option
+                        value="<?php echo $template_file; ?>"<?php if ($page_data['template'] == $template_file): ?> selected="selected"<?php endif; ?>> <?php echo $template_file; ?></option>
+                <?php endforeach; endif; ?>
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="language" class="col-lg-2 control-label"><?php echo $lang['page_language']; ?></label>
+
+        <div class="col-lg-10">
+            <select id="language" name="language" size="1" class="form-control form-control-default">
+                <option
+                    value=""<?php if (empty($page_data['language'])): ?> selected="selected"<?php endif; ?>><?php echo $lang['page_language_default']; ?></option>
+                <?php if (isset($page_languages)): foreach ($page_languages as $page_language): ?>
+                    <option
+                        value="<?php echo $page_language['identifier']; ?>"<?php if (isset($page_data['language']) && $page_data['language'] == $page_language['identifier']): ?> selected="selected"<?php endif; ?>> <?php echo $page_language['name']; ?></option>
+                <?php endforeach; endif; ?>
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="content_type" class="col-lg-2 control-label"><?php echo $lang['page_content_type']; ?></label>
+
+        <div class="col-lg-10">
+            <input id="content_type" type="text" name="content_type"
+                   value="<?php if (isset($page_data['content_type'])) echo $page_data['content_type']; ?>"
+                   placeholder="<?php echo $lang['page_content_type_exp']; ?>" size="20"
+                   class="form-control form-control-default"/>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="tv" class="col-lg-2 control-label"><?php echo $lang['template_variables']; ?></label>
+
+        <div class="col-lg-10">
+            <input type="text" id="tv" name="tv" value="<?php if (isset($page_data['tv'])) echo $page_data['tv']; ?>"
+                   placeholder="<?php echo $lang['values_comma_separated']; ?>"
+                   class="form-control form-control-default" size="40"/>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="edit_permission" class="col-lg-2 control-label"><?php echo $lang['edit_permission']; ?></label>
+
+        <div class="col-lg-10">
+            <input type="text" id="edit_permission" name="edit_permission"
+                   value="<?php if (isset($page_data['edit_permission'])) echo $page_data['edit_permission']; ?>"
+                   placeholder="<?php echo $lang['values_comma_separated']; ?>"
+                   class="form-control form-control-default" size="40"/>
+
+            <div class="checkbox">
+                <label for="edit_permission_general">
+                    <input id="edit_permission_general" type="checkbox" name="edit_permission_general"
+                           value="1"<?php if (isset($page_data['edit_permission_general']) && $page_data['edit_permission_general'] == 1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_permission_general']; ?>
+                </label>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="form-group">
+        <strong class="col-lg-2 control-label"><?php echo $lang['status']; ?></strong>
+
+        <div class="col-lg-10">
+            <div class="radio">
+                <label for="status_2"><input id="status_2" type="radio" name="status"
+                                             value="2"<?php if (isset($page_data['status']) && $page_data['status'] == 2): ?> checked="checked"<?php endif; ?> /><?php echo $lang['status_published_searchable']; ?>
+                </label><br/>
+                <label for="status_1"><input id="status_1" type="radio" name="status"
+                                             value="1"<?php if (isset($page_data['status']) && $page_data['status'] == 1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['status_published']; ?>
+                </label><br/>
+                <label for="status_0"><input id="status_0" type="radio" name="status"
+                                             value="0"<?php if (isset($page_data['status']) && $page_data['status'] == 0): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['status_draft']; ?>
+                </label>
+            </div>
+        </div>
+    </div>
+
+    </div>
+
+
+    <div class="tab-pane fade" id="include">
+
+
+        <div class="form-group">
+            <label for="include_page"
+                   class="col-lg-2 control-label"><?php echo $lang['edit_include_in_marking']; ?></label>
+
+            <div class="col-lg-10">
+                <select id="include_page" name="include_page" size="1"
+                        class="form-control form-control-inline form-control-medium">
+                    <option
+                        value=""<?php if (empty($page_data['include_page'])): ?> selected="selected"<?php endif; ?>><?php echo $lang['edit_include_page_marking']; ?></option>
+                    <?php foreach ($pages as $include_page): if ($include_page['type'] == 'overview' || $include_page['type'] == 'news'): ?>
+                        <option
+                            value="<?php echo $include_page['id']; ?>"<?php if (isset($page_data['include_page']) && $page_data['include_page'] == $include_page['id']): ?> selected="selected"<?php endif; ?>><?php echo $include_page['page']; ?></option>
+                    <?php endif; endforeach; ?>
+                </select>
+                <select name="include_rss" size="1" class="form-control form-control-inline form-control-medium">
+                    <option
+                        value=""<?php if (empty($page_data['include_rss'])): ?> selected="selected"<?php endif; ?>><?php echo $lang['edit_include_rss_marking']; ?></option>
+                    <?php foreach ($pages as $include_rss): if ($include_rss['type'] == 'rss'): ?>
+                        <option
+                            value="<?php echo $include_rss['id']; ?>"<?php if (isset($page_data['include_rss']) && $page_data['include_rss'] == $include_rss['id']): ?> selected="selected"<?php endif; ?>><?php echo $include_rss['page']; ?></option>
+                    <?php endif; endforeach; ?>
+                </select>
+                <select name="include_sitemap" size="1" class="form-control form-control-inline form-control-medium">
+                    <option
+                        value=""<?php if (empty($page_data['include_sitemap'])): ?> selected="selected"<?php endif; ?>><?php echo $lang['edit_include_sitemap_marking']; ?></option>
+                    <?php foreach ($pages as $include_sitemap): if ($include_sitemap['type'] == 'sitemap'): ?>
+                        <option
+                            value="<?php echo $include_sitemap['id']; ?>"<?php if (isset($page_data['include_sitemap']) && $page_data['include_sitemap'] == $include_sitemap['id']): ?> selected="selected"<?php endif; ?>><?php echo $include_sitemap['page']; ?></option>
+                    <?php endif; endforeach; ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="include_order"
+                   class="col-lg-2 control-label"><?php echo $lang['edit_order_number_marking']; ?></label>
+
+            <div class="col-lg-9">
+                <input type="text" id="include_order" name="include_order"
+                       value="<?php echo $page_data['include_order']; ?>" size="35"
+                       class="form-control form-control-small">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="teaser_headline"
+                   class="col-lg-2 control-label"><?php echo $lang['edit_teaser_headline_marking']; ?></label>
+
+            <div class="col-lg-9">
+                <input type="text" id="teaser_headline" name="teaser_headline"
+                       value="<?php if (isset($page_data['teaser_headline'])): ?><?php echo $page_data['teaser_headline']; ?><?php endif; ?>"
+                       size="35" class="form-control">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="teaser" class="col-lg-2 control-label"><?php echo $lang['edit_teaser_marking']; ?></label>
+
+            <div class="col-lg-9">
+                <textarea id="teaser" name="teaser" cols="75" rows="13"
+                          class="form-control"><?php if (isset($page_data['teaser'])) echo $page_data['teaser']; ?></textarea>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="link_name" class="col-lg-2 control-label"><?php echo $lang['edit_include_link']; ?></label>
+
+            <div class="col-lg-9">
+                <input type="text" id="link_name" name="link_name"
+                       value="<?php if (isset($page_data['link_name'])) echo $page_data['link_name']; ?>" size="35"
+                       class="form-control">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="teaser_img"
+                   class="col-lg-2 control-label"><?php echo $lang['edit_teaser_img_marking']; ?></label>
+
+            <div class="col-lg-9">
+                <div class="input-group">
+                    <input type="text" id="teaser_img" name="teaser_img"
+                           value="<?php if (isset($page_data['teaser_img'])) echo $page_data['teaser_img']; ?>"
+                           size="35" class="form-control">
 <span class="input-group-btn">
-<a class="btn btn-default modal-invoker" href="index.php?mode=modal&amp;action=insert_raw_image" title="<?php echo $lang['select_image']; ?>" data-toggle="modal" data-target="#modal_raw_image" data-insert="#teaser_img"><span class="glyphicon glyphicon-search"></span></a>
+<a class="btn btn-default modal-invoker" href="index.php?mode=modal&amp;action=insert_raw_image"
+   title="<?php echo $lang['select_image']; ?>" data-toggle="modal" data-target="#modal_raw_image"
+   data-insert="#teaser_img"><span class="glyphicon glyphicon-search"></span></a>
 </span>
-</div>
-
-
-</div>
-</div>
-
-</div>
-
-
-<div class="tab-pane fade" id="notes">
-<div class="form-group">
-<div class="col-lg-12">
-<label for="page_notes"><?php echo $lang['edit_page_notes_marking']; ?></label>
-<textarea id="page_notes" name="page_notes" cols="70" rows="20" class="form-control"><?php if(isset($page_data['page_notes'])) echo $page_data['page_notes']; ?></textarea>
-</div>
-</div>
-
-</div>     
-
-</div>
-
-<div class="row">
-<div class="col-md-10">
-<?php if(isset($page_data['id'])): ?> 
-<div class="radio">
-<p><label for="edit_mode_0">
-<input id="edit_mode_0" type="radio" name="edit_mode" value="0"<?php if(isset($edit_mode) && $edit_mode==0): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_page_mode_edit']; ?>
-</label><br />
-<label for="edit_mode_1">
-<input id="edit_mode_1" type="radio" name="edit_mode" value="1"<?php if(isset($edit_mode) && $edit_mode==1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_page_mode_save_as_new']; ?>
-</label></p>
-</div>
-<?php endif; ?>
-</div>
-<div class="col-md-2"><button class="btn btn-lg btn-success pull-right"><span class="glyphicon glyphicon-save"></span> <?php echo $lang['edit_page_submit']; ?></button></div>
-</div>
-
-</div>
-</form>
+                </div>
+
+
+            </div>
+        </div>
+
+    </div>
+
+
+    <div class="tab-pane fade" id="notes">
+        <div class="form-group">
+            <div class="col-lg-12">
+                <label for="page_notes"><?php echo $lang['edit_page_notes_marking']; ?></label>
+                <textarea id="page_notes" name="page_notes" cols="70" rows="20"
+                          class="form-control"><?php if (isset($page_data['page_notes'])) echo $page_data['page_notes']; ?></textarea>
+            </div>
+        </div>
+
+    </div>
+
+    </div>
+
+    <div class="row">
+        <div class="col-md-10">
+            <?php if (isset($page_data['id'])): ?>
+                <div class="radio">
+                    <p><label for="edit_mode_0">
+                            <input id="edit_mode_0" type="radio" name="edit_mode"
+                                   value="0"<?php if (isset($edit_mode) && $edit_mode == 0): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_page_mode_edit']; ?>
+                        </label><br/>
+                        <label for="edit_mode_1">
+                            <input id="edit_mode_1" type="radio" name="edit_mode"
+                                   value="1"<?php if (isset($edit_mode) && $edit_mode == 1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_page_mode_save_as_new']; ?>
+                        </label></p>
+                </div>
+            <?php endif; ?>
+        </div>
+        <div class="col-md-2">
+            <button class="btn btn-lg btn-success pull-right"><span
+                    class="glyphicon glyphicon-save"></span> <?php echo $lang['edit_page_submit']; ?></button>
+        </div>
+    </div>
+
+    </div>
+    </form>
 
 <?php endif; ?>
 <div class="modal fade" id="modal_image" tabindex="-1">
-<div class="modal-dialog">
-<div class="modal-content">
-</div>
-</div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+        </div>
+    </div>
 </div>
 <div class="modal fade" id="modal_thumbnail" tabindex="-1">
-<div class="modal-dialog">
-<div class="modal-content">
-</div>
-</div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+        </div>
+    </div>
 </div>
 <div class="modal fade" id="modal_gallery" tabindex="-1">
-<div class="modal-dialog">
-<div class="modal-content">
-</div>
-</div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+        </div>
+    </div>
 </div>
 <div class="modal fade" id="modal_raw_image" tabindex="-1">
-<div class="modal-dialog">
-<div class="modal-content">
-</div>
-</div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+        </div>
+    </div>
 </div>
diff --git a/cms/templates/admin/subtemplates/errors.inc.tpl b/cms/templates/admin/subtemplates/errors.inc.tpl
index dafed27..b0c8e6b 100644
--- a/cms/templates/admin/subtemplates/errors.inc.tpl
+++ b/cms/templates/admin/subtemplates/errors.inc.tpl
@@ -1,11 +1,12 @@
-<?php if(isset($errors)): ?>
-<div class="alert alert-danger">
-<button type="button" class="close" data-dismiss="alert">&times;</button>
-<h3><span class="glyphicon glyphicon-warning-sign"></span> <strong><?php echo $lang['error_headline']; ?></strong></h3>
-<ul>
-<?php foreach($errors as $error): ?>
-<li><?php if(isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
-<?php endforeach; ?>
-</ul>
-</div>
+<?php if (isset($errors)): ?>
+    <div class="alert alert-danger">
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+        <h3><span class="glyphicon glyphicon-warning-sign"></span>
+            <strong><?php echo $lang['error_headline']; ?></strong></h3>
+        <ul>
+            <?php foreach ($errors as $error): ?>
+                <li><?php if (isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
+            <?php endforeach; ?>
+        </ul>
+    </div>
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/filemanager.inc.tpl b/cms/templates/admin/subtemplates/filemanager.inc.tpl
index ffad8ad..21b6822 100644
--- a/cms/templates/admin/subtemplates/filemanager.inc.tpl
+++ b/cms/templates/admin/subtemplates/filemanager.inc.tpl
@@ -1,55 +1,71 @@
 <div class="row">
-<div class="col-md-10">
-<h1><?php echo $lang['filemanager']; ?></h1>
-</div>
-<div class="col-md-2">
-<a class="btn btn-success btn-top pull-right" href="index.php?mode=filemanager&amp;action=upload&amp;directory=<?php echo $directory; ?>"><span class="glyphicon glyphicon-upload"></span> <?php echo $lang['upload_file_link']; ?></a>
-</div>
+    <div class="col-md-10">
+        <h1><?php echo $lang['filemanager']; ?></h1>
+    </div>
+    <div class="col-md-2">
+        <a class="btn btn-success btn-top pull-right"
+           href="index.php?mode=filemanager&amp;action=upload&amp;directory=<?php echo $directory; ?>"><span
+                class="glyphicon glyphicon-upload"></span> <?php echo $lang['upload_file_link']; ?></a>
+    </div>
 </div>
 
 
 <h1></h1>
 
 <form class="form-inline" action="<?php echo basename($_SERVER['PHP_SELF']); ?>" method="get">
- <div class="form-group">
-  <input type="hidden" name="mode" value="filemanager" />
-  <label for="directory"><?php echo $lang['directory']; ?></label> <select id="directory" class="form-control" size="1" name="directory" onchange="this.form.submit();">
-  <option value="<?php echo $file_dir ?>"<?php if($directory==$file_dir): ?> selected="selected"<?php endif; ?>><?php echo $file_dir ?></option>
-  <option value="<?php echo $media_dir ?>"<?php if($directory==$media_dir): ?> selected="selected"<?php endif; ?>><?php echo $media_dir ?></option>
-  </select>
-</div>
+    <div class="form-group">
+        <input type="hidden" name="mode" value="filemanager"/>
+        <label for="directory"><?php echo $lang['directory']; ?></label> <select id="directory" class="form-control"
+                                                                                 size="1" name="directory"
+                                                                                 onchange="this.form.submit();">
+            <option
+                value="<?php echo $file_dir ?>"<?php if ($directory == $file_dir): ?> selected="selected"<?php endif; ?>><?php echo $file_dir ?></option>
+            <option
+                value="<?php echo $media_dir ?>"<?php if ($directory == $media_dir): ?> selected="selected"<?php endif; ?>><?php echo $media_dir ?></option>
+        </select>
+    </div>
 </form>
-    
-<?php if(isset($files)): ?>
+
+<?php if (isset($files)): ?>
 
 <div class="table-responsive">
-<table class="table table-striped table-hover">
- <thead>
- <tr>
-  <th><?php echo $lang['file']; ?></th>
-  <?php if(isset($mime_content_type)): ?><th><?php echo $lang['file_type']; ?></th><?php endif; ?>
-  <th><?php echo $lang['file_size']; ?></th>
-  <th><?php echo $lang['file_date']; ?></th>
-  <th>&nbsp;</th>
- </tr>
- </thead>
- <tbody>
-<?php $i=0; foreach($files as $file): ?>
-        
-<tr>
- <td><a href="<?php echo BASE_URL . 'static/' . $directory . '/' .$file['filename']; ?>"><?php echo $file['filename']; ?></a></td>
- <?php if(isset($mime_content_type)): ?><td><?php echo $file['mime_content_type']; ?></td><?php endif; ?>
- <td><?php echo $file['size']; ?></td>
- <td><?php echo $file['last_modified']; ?></td>
- <td class="options"><a class="btn btn-danger btn-xs" href="index.php?mode=filemanager&amp;directory=<?php echo $directory; ?>&amp;delete=<?php echo $file['filename']; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_file_confirm']); ?>"><span class="glyphicon glyphicon-remove"></span></a></td>
-</tr>
-
-<?php ++$i; endforeach ?>
-</tbody>
-</table>
-
-<?php else: ?>
-
-<p><i><?php echo $lang['no_files']; ?></i></p>
-
-<?php endif; ?>
+    <table class="table table-striped table-hover">
+        <thead>
+        <tr>
+            <th><?php echo $lang['file']; ?></th>
+            <?php if (isset($mime_content_type)): ?>
+                <th><?php echo $lang['file_type']; ?></th><?php endif; ?>
+            <th><?php echo $lang['file_size']; ?></th>
+            <th><?php echo $lang['file_date']; ?></th>
+            <th>&nbsp;</th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php $i = 0;
+        foreach ($files as $file): ?>
+
+            <tr>
+                <td>
+                    <a href="<?php echo BASE_URL . 'static/' . $directory . '/' . $file['filename']; ?>"><?php echo $file['filename']; ?></a>
+                </td>
+                <?php if (isset($mime_content_type)): ?>
+                    <td><?php echo $file['mime_content_type']; ?></td><?php endif; ?>
+                <td><?php echo $file['size']; ?></td>
+                <td><?php echo $file['last_modified']; ?></td>
+                <td class="options"><a class="btn btn-danger btn-xs"
+                                       href="index.php?mode=filemanager&amp;directory=<?php echo $directory; ?>&amp;delete=<?php echo $file['filename']; ?>"
+                                       title="<?php echo $lang['delete']; ?>"
+                                       data-delete-confirm="<?php echo rawurlencode($lang['delete_file_confirm']); ?>"><span
+                            class="glyphicon glyphicon-remove"></span></a></td>
+            </tr>
+
+            <?php ++$i; endforeach ?>
+        </tbody>
+    </table>
+
+    <?php else: ?>
+
+        <p><i><?php echo $lang['no_files']; ?></i></p>
+
+    <?php
+    endif; ?>
diff --git a/cms/templates/admin/subtemplates/filemanager_delete.inc.tpl b/cms/templates/admin/subtemplates/filemanager_delete.inc.tpl
index 3290771..6a5d4a6 100644
--- a/cms/templates/admin/subtemplates/filemanager_delete.inc.tpl
+++ b/cms/templates/admin/subtemplates/filemanager_delete.inc.tpl
@@ -1,13 +1,15 @@
-<h1><a href="index.php"><?php echo $lang['administration']; ?></a> &raquo; <a href="index.php?mode=filemanager"><?php echo $lang['filemanager']; ?></a> &raquo; <?php echo $lang['delete_file']; ?></h1>
-
-<p><?php echo str_replace('[file]',$file,$lang['delete_file_confirm']); ?></p>
-
+<h1><a href="index.php"><?php echo $lang['administration']; ?></a> &raquo; <a
+        href="index.php?mode=filemanager"><?php echo $lang['filemanager']; ?></a> &raquo; <?php echo $lang['delete_file']; ?>
+</h1>
+
+<p><?php echo str_replace('[file]', $file, $lang['delete_file_confirm']); ?></p>
+
 <form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="filemanager" />
-  <input type="hidden" name="delete" value="<?php echo $file ?>" />
-  <input type="hidden" name="dir" value="<?php echo $directory; ?>" />
-  <input type="submit" name="confirmed" value="<?php echo $lang['delete_file_submit']; ?>">
- </div>
+    <div>
+        <input type="hidden" name="mode" value="filemanager"/>
+        <input type="hidden" name="delete" value="<?php echo $file ?>"/>
+        <input type="hidden" name="dir" value="<?php echo $directory; ?>"/>
+        <input type="submit" name="confirmed" value="<?php echo $lang['delete_file_submit']; ?>">
+    </div>
 </form>
-
+
diff --git a/cms/templates/admin/subtemplates/filemanager_upload.inc.tpl b/cms/templates/admin/subtemplates/filemanager_upload.inc.tpl
index 2bbb202..1da520c 100644
--- a/cms/templates/admin/subtemplates/filemanager_upload.inc.tpl
+++ b/cms/templates/admin/subtemplates/filemanager_upload.inc.tpl
@@ -1,85 +1,111 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=filemanager"><?php echo $lang['filemanager']; ?></a></li>
-<li class="active"><?php echo $lang['upload_file']; ?></li>
+    <li><a href="index.php?mode=filemanager"><?php echo $lang['filemanager']; ?></a></li>
+    <li class="active"><?php echo $lang['upload_file']; ?></li>
 </ol>
 
 <h1><?php echo $lang['upload_file']; ?></h1>
 <?php include('errors.inc.tpl'); ?>
 
 <form action="<?php echo basename($_SERVER['PHP_SELF']); ?>" method="post" enctype="multipart/form-data">
-<div>
-<input type="hidden" name="mode" value="filemanager" />
-<input type="hidden" name="upload_file_submit" value="true"> 
+    <div>
+        <input type="hidden" name="mode" value="filemanager"/>
+        <input type="hidden" name="upload_file_submit" value="true">
 
-<fieldset>
-<legend><?php echo $lang['file_legend']; ?></legend>
+        <fieldset>
+            <legend><?php echo $lang['file_legend']; ?></legend>
 
-<div class="form-group">
-<label for="file" class="sr-only"><?php echo $lang['upload_file_label']; ?></label>
-<input id="file" type="file" name="file">
-</div>
+            <div class="form-group">
+                <label for="file" class="sr-only"><?php echo $lang['upload_file_label']; ?></label>
+                <input id="file" type="file" name="file">
+            </div>
 
-<div class="form-group">
-<label for="directory"><?php echo $lang['upload_directory_label']; ?></label>
-<select id="directory" class="form-control form-control-default" name="directory" size="1">
-<option value="<?php echo $media_dir ?>"<?php if($directory==$media_dir) { ?> selected="selected"<?php } ?>><?php echo $media_dir ?></option>
-<option value="<?php echo $file_dir ?>"<?php if($directory==$file_dir) { ?> selected="selected"<?php } ?>><?php echo $file_dir ?></option>
-</select>
-</div>
+            <div class="form-group">
+                <label for="directory"><?php echo $lang['upload_directory_label']; ?></label>
+                <select id="directory" class="form-control form-control-default" name="directory" size="1">
+                    <option
+                        value="<?php echo $media_dir ?>"<?php if ($directory == $media_dir) { ?> selected="selected"<?php } ?>><?php echo $media_dir ?></option>
+                    <option
+                        value="<?php echo $file_dir ?>"<?php if ($directory == $file_dir) { ?> selected="selected"<?php } ?>><?php echo $file_dir ?></option>
+                </select>
+            </div>
 
-<div class="form-group">
-<label for="file_name"><?php echo $lang['filename_on_server']; ?></label>
-<input id="file_name" class="form-control form-control-default" type="text" name="file_name" value="<?php if(isset($file_name)) echo htmlspecialchars(stripslashes($file_name)); ?>" placeholder="<?php echo $lang['filename_server_same']; ?>">
-</div>
+            <div class="form-group">
+                <label for="file_name"><?php echo $lang['filename_on_server']; ?></label>
+                <input id="file_name" class="form-control form-control-default" type="text" name="file_name"
+                       value="<?php if (isset($file_name)) echo htmlspecialchars(stripslashes($file_name)); ?>"
+                       placeholder="<?php echo $lang['filename_server_same']; ?>">
+            </div>
 
-<div class="checkbox">
-<label>
-<input id="overwrite_file" type="checkbox" name="overwrite_file" value="true"> <?php echo $lang['overwrite_file']; ?>
-</label>
-</div>
+            <div class="checkbox">
+                <label>
+                    <input id="overwrite_file" type="checkbox" name="overwrite_file"
+                           value="true"> <?php echo $lang['overwrite_file']; ?>
+                </label>
+            </div>
 
-</fieldset>
+        </fieldset>
 
-<fieldset>
-<legend><?php echo $lang['image_options']; ?></legend>
+        <fieldset>
+            <legend><?php echo $lang['image_options']; ?></legend>
 
-<div class="form-group">
-<div class="radio">
-<label>
-<input id="upload_mode_1" type="radio" name="upload_mode" value="1"<?php if(isset($upload_mode) && $upload_mode==1 || empty($upload_mode)) { ?> checked="checked"<?php } ?>>
-<?php echo $lang['dont_manipulate_image']; ?>
-</label>
-</div>
-<div class="radio">
-<label>
-<input id="upload_mode_2" type="radio" name="upload_mode" value="2"<?php if(isset($upload_mode) && $upload_mode==2) { ?> checked="checked"<?php } ?>>
-<?php echo $lang['manipulate_image']; ?>
-</label><br />
-<input id="resize" class="form-control form-control-small form-control-inline" type="text" name="resize" value="<?php if(isset($resize)) echo intval($resize); else echo $settings['resize']; ?>" size="3" /> px
-<select class="form-control form-control-small form-control-inline" name="resize_xy" size="1">
-<option value="x"<?php if((isset($resize_xy) && $resize_xy=='x') || (empty($resize_xy) && $settings['resize_xy']=='x')) { ?> selected="selected"<?php } ?>><?php echo $lang['resize_width']; ?></option>
-<option value="y"<?php if((isset($resize_xy) && $resize_xy=='y') || (empty($resize_xy) && $settings['resize_xy']=='y')) { ?> selected="selected"<?php } ?>><?php echo $lang['resize_height']; ?></option>
-</select>,
-<input id="compression" class="form-control form-control-small form-control-inline" type="text" name="compression" value="<?php if(isset($compression)) echo intval($compression); else echo $settings['compression']; ?>" size="3" /> % <?php echo $lang['compression']; ?> <?php echo $lang['compression_jpg_only']; ?>
-</div>
-</div>
-<div class="checkbox">
-<label>
-<input id="create_thumbnail" type="checkbox" name="create_thumbnail" value="1"<?php if(isset($create_thumbnail) && $create_thumbnail==1) { ?> checked="checked"<?php } ?>> <?php echo $lang['create_thumbnail']; ?>
-</label><br />
-<input id="thumbnail_resize" class="form-control form-control-small form-control-inline" type="text" name="thumbnail_resize" value="<?php if(isset($thumbnail_resize)) echo intval($thumbnail_resize); else echo $settings['thumbnail_resize']; ?>" size="3" /> px
-<select class="form-control form-control-small form-control-inline" name="thumbnail_resize_xy" size="1">
-<option value="x"<?php if((isset($thumbnail_resize_xy) && $thumbnail_resize_xy=='x') || (empty($thumbnail_resize_xy) && $settings['thumbnail_resize_xy']=='x')) { ?> selected="selected"<?php } ?>><?php echo $lang['resize_width']; ?></option>
-<option value="y"<?php if((isset($thumbnail_resize_xy) && $thumbnail_resize_xy=='y') || (empty($thumbnail_resize_xy) && $settings['thumbnail_resize_xy']=='y')) { ?> selected="selected"<?php } ?>><?php echo $lang['resize_height']; ?></option>
-</select>,
-<input id="thumbnail_compression" class="form-control form-control-small form-control-inline" type="text" name="thumbnail_compression" value="<?php if(isset($thumbnail_compression)) echo intval($thumbnail_compression); else echo $settings['thumbnail_compression']; ?>" size="3" /> % <?php echo $lang['compression']; ?> <?php echo $lang['compression_jpg_only']; ?>
-</div>
+            <div class="form-group">
+                <div class="radio">
+                    <label>
+                        <input id="upload_mode_1" type="radio" name="upload_mode"
+                               value="1"<?php if (isset($upload_mode) && $upload_mode == 1 || empty($upload_mode)) { ?> checked="checked"<?php } ?>>
+                        <?php echo $lang['dont_manipulate_image']; ?>
+                    </label>
+                </div>
+                <div class="radio">
+                    <label>
+                        <input id="upload_mode_2" type="radio" name="upload_mode"
+                               value="2"<?php if (isset($upload_mode) && $upload_mode == 2) { ?> checked="checked"<?php } ?>>
+                        <?php echo $lang['manipulate_image']; ?>
+                    </label><br/>
+                    <input id="resize" class="form-control form-control-small form-control-inline" type="text"
+                           name="resize"
+                           value="<?php if (isset($resize)) echo intval($resize); else echo $settings['resize']; ?>"
+                           size="3"/> px
+                    <select class="form-control form-control-small form-control-inline" name="resize_xy" size="1">
+                        <option
+                            value="x"<?php if ((isset($resize_xy) && $resize_xy == 'x') || (empty($resize_xy) && $settings['resize_xy'] == 'x')) { ?> selected="selected"<?php } ?>><?php echo $lang['resize_width']; ?></option>
+                        <option
+                            value="y"<?php if ((isset($resize_xy) && $resize_xy == 'y') || (empty($resize_xy) && $settings['resize_xy'] == 'y')) { ?> selected="selected"<?php } ?>><?php echo $lang['resize_height']; ?></option>
+                    </select>,
+                    <input id="compression" class="form-control form-control-small form-control-inline" type="text"
+                           name="compression"
+                           value="<?php if (isset($compression)) echo intval($compression); else echo $settings['compression']; ?>"
+                           size="3"/> % <?php echo $lang['compression']; ?> <?php echo $lang['compression_jpg_only']; ?>
+                </div>
+            </div>
+            <div class="checkbox">
+                <label>
+                    <input id="create_thumbnail" type="checkbox" name="create_thumbnail"
+                           value="1"<?php if (isset($create_thumbnail) && $create_thumbnail == 1) { ?> checked="checked"<?php } ?>> <?php echo $lang['create_thumbnail']; ?>
+                </label><br/>
+                <input id="thumbnail_resize" class="form-control form-control-small form-control-inline" type="text"
+                       name="thumbnail_resize"
+                       value="<?php if (isset($thumbnail_resize)) echo intval($thumbnail_resize); else echo $settings['thumbnail_resize']; ?>"
+                       size="3"/> px
+                <select class="form-control form-control-small form-control-inline" name="thumbnail_resize_xy" size="1">
+                    <option
+                        value="x"<?php if ((isset($thumbnail_resize_xy) && $thumbnail_resize_xy == 'x') || (empty($thumbnail_resize_xy) && $settings['thumbnail_resize_xy'] == 'x')) { ?> selected="selected"<?php } ?>><?php echo $lang['resize_width']; ?></option>
+                    <option
+                        value="y"<?php if ((isset($thumbnail_resize_xy) && $thumbnail_resize_xy == 'y') || (empty($thumbnail_resize_xy) && $settings['thumbnail_resize_xy'] == 'y')) { ?> selected="selected"<?php } ?>><?php echo $lang['resize_height']; ?></option>
+                </select>,
+                <input id="thumbnail_compression" class="form-control form-control-small form-control-inline"
+                       type="text" name="thumbnail_compression"
+                       value="<?php if (isset($thumbnail_compression)) echo intval($thumbnail_compression); else echo $settings['thumbnail_compression']; ?>"
+                       size="3"/> % <?php echo $lang['compression']; ?> <?php echo $lang['compression_jpg_only']; ?>
+            </div>
 
-</fieldset>
-     
-<div class="form-group">
-<br /><button class="btn btn-primary btn-lg" type="submit"><span class="glyphicon glyphicon-upload"></span> <?php echo $lang['upload_file_submit']; ?></button>
-</div>
-     
-</div>
+        </fieldset>
+
+        <div class="form-group">
+            <br/>
+            <button class="btn btn-primary btn-lg" type="submit"><span
+                    class="glyphicon glyphicon-upload"></span> <?php echo $lang['upload_file_submit']; ?></button>
+        </div>
+
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/galleries.inc.tpl b/cms/templates/admin/subtemplates/galleries.inc.tpl
index 7298683..6c129e2 100644
--- a/cms/templates/admin/subtemplates/galleries.inc.tpl
+++ b/cms/templates/admin/subtemplates/galleries.inc.tpl
@@ -1,37 +1,45 @@
 <div class="row">
-<div class="col-md-10">
-<h1><?php echo $lang['photo_galleries']; ?></h1>
-</div>
-<div class="col-md-2">
-<a class="btn btn-success btn-top pull-right" href="index.php?mode=galleries&amp;action=new"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['create_new_gallery']; ?></a>
-</div>
+    <div class="col-md-10">
+        <h1><?php echo $lang['photo_galleries']; ?></h1>
+    </div>
+    <div class="col-md-2">
+        <a class="btn btn-success btn-top pull-right" href="index.php?mode=galleries&amp;action=new"><span
+                class="glyphicon glyphicon-plus"></span> <?php echo $lang['create_new_gallery']; ?></a>
+    </div>
 </div>
 
-<?php if(isset($galleries)): ?>
+<?php if (isset($galleries)): ?>
 
-<div class="table-responsive">
-<table class="table table-striped table-hover">
-<thead>
- <tr>
-  <th><?php echo $lang['gallery']; ?></th>
-  <th colspan="2">&nbsp;</th>
- </tr>
-</thead>
-<tbody>
- <?php $i=0; foreach($galleries as $gallery): ?>
- <tr>
-  <td><?php echo htmlspecialchars(stripslashes($gallery)); ?></td>
-  <td class="options"><a href="index.php?mode=galleries&amp;edit=<?php echo $gallery; ?>" title="<?php echo $lang['edit']; ?>" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>&nbsp; <a href="index.php?mode=galleries&amp;delete_gallery=<?php echo $gallery; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_gallery_confirm']); ?>" title="<?php echo $lang['delete']; ?>" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
- </tr>
- <?php $i++; endforeach; ?>
-</tbody>
-</table>
-</div>
+    <div class="table-responsive">
+        <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+                <th><?php echo $lang['gallery']; ?></th>
+                <th colspan="2">&nbsp;</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php $i = 0;
+            foreach ($galleries as $gallery): ?>
+                <tr>
+                    <td><?php echo htmlspecialchars(stripslashes($gallery)); ?></td>
+                    <td class="options"><a href="index.php?mode=galleries&amp;edit=<?php echo $gallery; ?>"
+                                           title="<?php echo $lang['edit']; ?>" class="btn btn-primary btn-xs"><span
+                                class="glyphicon glyphicon-pencil"></span></a>&nbsp; <a
+                            href="index.php?mode=galleries&amp;delete_gallery=<?php echo $gallery; ?>"
+                            data-delete-confirm="<?php echo rawurlencode($lang['delete_gallery_confirm']); ?>"
+                            title="<?php echo $lang['delete']; ?>" class="btn btn-danger btn-xs"><span
+                                class="glyphicon glyphicon-remove"></span></a></td>
+                </tr>
+                <?php $i++; endforeach; ?>
+            </tbody>
+        </table>
+    </div>
 
 <?php else: ?>
-       
-<div class="alert alert-warning">
-<?php echo $lang['no_gallery']; ?>
-</div>
+
+    <div class="alert alert-warning">
+        <?php echo $lang['no_gallery']; ?>
+    </div>
 
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/galleries_delete.inc.tpl b/cms/templates/admin/subtemplates/galleries_delete.inc.tpl
index 551a13e..3a734b6 100644
--- a/cms/templates/admin/subtemplates/galleries_delete.inc.tpl
+++ b/cms/templates/admin/subtemplates/galleries_delete.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a></li>
-<li class="active"><?php echo $lang['delete_gallery']; ?></li>
+    <li><a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a></li>
+    <li class="active"><?php echo $lang['delete_gallery']; ?></li>
 </ol>
 
 <h1><?php echo $lang['delete_gallery']; ?></h1>
@@ -8,10 +8,11 @@
 <p><?php echo str_replace('[gallery]', $gallery, $lang['delete_gallery_confirm']); ?></p>
 
 <form action="index.php" method="post">
-<div>
- <input type="hidden" name="mode" value="galleries" />
- <input type="hidden" name="delete_gallery" value="<?php echo $gallery; ?>" />
- <input class="btn btn-danger btn-lg" type="submit" name="confirmed" value="<?php echo $lang['delete_gallery_submit']; ?>" />
-</div>
+    <div>
+        <input type="hidden" name="mode" value="galleries"/>
+        <input type="hidden" name="delete_gallery" value="<?php echo $gallery; ?>"/>
+        <input class="btn btn-danger btn-lg" type="submit" name="confirmed"
+               value="<?php echo $lang['delete_gallery_submit']; ?>"/>
+    </div>
 </form>
 
diff --git a/cms/templates/admin/subtemplates/galleries_edit.inc.tpl b/cms/templates/admin/subtemplates/galleries_edit.inc.tpl
index c54d3c8..ece0228 100644
--- a/cms/templates/admin/subtemplates/galleries_edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/galleries_edit.inc.tpl
@@ -1,48 +1,66 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a></li>
-<li class="active"><?php echo str_replace('[gallery]',$gallery,$lang['edit_gallery']); ?></li>
+    <li><a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a></li>
+    <li class="active"><?php echo str_replace('[gallery]', $gallery, $lang['edit_gallery']); ?></li>
 </ol>
 
 <div class="row">
-<div class="col-md-10">
-<h1><?php echo str_replace('[gallery]',$gallery,$lang['edit_gallery']); ?></h1>
-</div>
-<div class="col-md-2">
-<a class="btn btn-success btn-top pull-right" href="index.php?mode=galleries&amp;new_photo=<?php echo $gallery; ?>"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['add_photo']; ?></a>
-</div>
+    <div class="col-md-10">
+        <h1><?php echo str_replace('[gallery]', $gallery, $lang['edit_gallery']); ?></h1>
+    </div>
+    <div class="col-md-2">
+        <a class="btn btn-success btn-top pull-right"
+           href="index.php?mode=galleries&amp;new_photo=<?php echo $gallery; ?>"><span
+                class="glyphicon glyphicon-plus"></span> <?php echo $lang['add_photo']; ?></a>
+    </div>
 </div>
 
-<?php if(isset($items)): ?>
+<?php if (isset($items)): ?>
 
-<table class="table table-striped table-hover">
- <thead>
-  <tr>
-   <th><?php echo $lang['photo']; ?></th>
-   <th><?php echo $lang['photo_title']; ?></th>
-   <th><?php echo $lang['photo_subtitle']; ?></th>
-   <th><?php echo $lang['photo_description']; ?></th>
-   <th>&nbsp;</th>
-  </tr>
- </thead>
- <tbody data-sortable="<?php echo BASE_URL; ?>cms/?mode=galleries&amp;reorder_photos=true">
-  <?php $i=0; foreach($items as $item): ?>
-  <tr id="item_<?php echo $item['id']; ?>">
-   <td><a class="thumbnail" href="<?php echo BASE_URL.MEDIA_DIR.$item['photo_normal']; ?>" data-lightbox><img id="photo<?php echo $item['id']; ?>" src="<?php echo BASE_URL.MEDIA_DIR.$item['photo_thumbnail']; ?>" title="<?php echo htmlspecialchars($item['title']); ?>" alt="<?php echo htmlspecialchars($item['title']); ?>" data-subtitle="<?php echo htmlspecialchars($item['subtitle']); ?>" data-description="<?php echo htmlspecialchars($item['description']); ?>" /></a></td>
-   <td><?php echo $item['title']; ?></td>
-   <td><?php echo $item['subtitle']; ?></td>
-   <td><?php echo $item['description']; ?></td>
-   <td class="nowrap"><a href="index.php?mode=galleries&amp;edit_photo=<?php echo $item['id']; ?>" title="<?php echo $lang['edit']; ?>" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
-   <a href="index.php?mode=galleries&amp;delete_photo=<?php echo $item['id']; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_photo_confirm']); ?>" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
-   <span class="btn btn-success btn-xs sortable-handle" title="<?php echo $lang['drag_and_drop']; ?>"><span class="glyphicon glyphicon-sort"></span></span><!--<a href="index.php?mode=galleries&amp;move_up_photo=<?php echo $item['id']; ?>#photo<?php echo $item['id']; ?>"><img src="<?php echo BASE_URL; ?>templates/admin/images/arrow_up.png" alt="<?php echo $lang['move_up']; ?>" title="<?php echo $lang['move_up']; ?>" width="16" height="16" /></a><a href="index.php?mode=galleries&amp;move_down_photo=<?php echo $item['id']; ?>#photo<?php echo $item['id']; ?>"><img src="<?php echo BASE_URL; ?>templates/admin/images/arrow_down.png" alt="<?php echo $lang['move_down']; ?>" title="<?php echo $lang['move_down']; ?>" width="16" height="16" /></a>--></td>
-  </tr>
-  <?php $i++; endforeach ?>
- </tbody>
-</table>
+    <table class="table table-striped table-hover">
+        <thead>
+        <tr>
+            <th><?php echo $lang['photo']; ?></th>
+            <th><?php echo $lang['photo_title']; ?></th>
+            <th><?php echo $lang['photo_subtitle']; ?></th>
+            <th><?php echo $lang['photo_description']; ?></th>
+            <th>&nbsp;</th>
+        </tr>
+        </thead>
+        <tbody data-sortable="<?php echo BASE_URL; ?>cms/?mode=galleries&amp;reorder_photos=true">
+        <?php $i = 0;
+        foreach ($items as $item): ?>
+            <tr id="item_<?php echo $item['id']; ?>">
+                <td><a class="thumbnail" href="<?php echo BASE_URL . MEDIA_DIR . $item['photo_normal']; ?>"
+                       data-lightbox><img id="photo<?php echo $item['id']; ?>"
+                                          src="<?php echo BASE_URL . MEDIA_DIR . $item['photo_thumbnail']; ?>"
+                                          title="<?php echo htmlspecialchars($item['title']); ?>"
+                                          alt="<?php echo htmlspecialchars($item['title']); ?>"
+                                          data-subtitle="<?php echo htmlspecialchars($item['subtitle']); ?>"
+                                          data-description="<?php echo htmlspecialchars($item['description']); ?>"/></a>
+                </td>
+                <td><?php echo $item['title']; ?></td>
+                <td><?php echo $item['subtitle']; ?></td>
+                <td><?php echo $item['description']; ?></td>
+                <td class="nowrap"><a href="index.php?mode=galleries&amp;edit_photo=<?php echo $item['id']; ?>"
+                                      title="<?php echo $lang['edit']; ?>" class="btn btn-primary btn-xs"><span
+                            class="glyphicon glyphicon-pencil"></span></a>
+                    <a href="index.php?mode=galleries&amp;delete_photo=<?php echo $item['id']; ?>"
+                       title="<?php echo $lang['delete']; ?>"
+                       data-delete-confirm="<?php echo rawurlencode($lang['delete_photo_confirm']); ?>"
+                       class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+                    <span class="btn btn-success btn-xs sortable-handle"
+                          title="<?php echo $lang['drag_and_drop']; ?>"><span
+                            class="glyphicon glyphicon-sort"></span></span><!--<a href="index.php?mode=galleries&amp;move_up_photo=<?php echo $item['id']; ?>#photo<?php echo $item['id']; ?>"><img src="<?php echo BASE_URL; ?>templates/admin/images/arrow_up.png" alt="<?php echo $lang['move_up']; ?>" title="<?php echo $lang['move_up']; ?>" width="16" height="16" /></a><a href="index.php?mode=galleries&amp;move_down_photo=<?php echo $item['id']; ?>#photo<?php echo $item['id']; ?>"><img src="<?php echo BASE_URL; ?>templates/admin/images/arrow_down.png" alt="<?php echo $lang['move_down']; ?>" title="<?php echo $lang['move_down']; ?>" width="16" height="16" /></a>-->
+                </td>
+            </tr>
+            <?php $i++; endforeach ?>
+        </tbody>
+    </table>
 
 <?php else: ?>
 
-<div class="alert alert-warning">
-<?php echo $lang['no_photo']; ?>
-</div>
+    <div class="alert alert-warning">
+        <?php echo $lang['no_photo']; ?>
+    </div>
 
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/galleries_edit_photo.inc.tpl b/cms/templates/admin/subtemplates/galleries_edit_photo.inc.tpl
index 697f83e..27c2a06 100644
--- a/cms/templates/admin/subtemplates/galleries_edit_photo.inc.tpl
+++ b/cms/templates/admin/subtemplates/galleries_edit_photo.inc.tpl
@@ -1,97 +1,118 @@
-<?php if(isset($invalid_photo)): ?>
-<p class="caution"><?php echo $lang['invalid_photo']; ?></p>
+<?php if (isset($invalid_photo)): ?>
+    <p class="caution"><?php echo $lang['invalid_photo']; ?></p>
 <?php else: ?>
 
-<ol class="breadcrumb">
-<li><a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a></li>
-<li><a href="index.php?mode=galleries&amp;edit=<?php echo $photo_data['gallery']; ?>"><?php echo str_replace('[gallery]',$photo_data['gallery'],$lang['edit_gallery']); ?></a></li>
-<li class="active"><?php if(isset($photo_data['id'])) echo $lang['edit_photo']; else echo $lang['new_photo']; ?></li>
-</ol>
-
-<h1><?php if(isset($photo_data['id'])) echo $lang['edit_photo']; else echo $lang['new_photo']; ?></h1>
-
-<?php include('errors.inc.tpl'); ?>
-
-
-<form class="form-horizontal" role="form" action="index.php" method="post">
-<div>
-<input type="hidden" name="mode" value="galleries">
-<input type="hidden" name="description_formatting" value="1">
-<?php if(isset($photo_data['id'])): ?>
-<input type="hidden" name="id" value="<?php echo $photo_data['id']; ?>" />
-<?php endif; ?>
-<?php if(isset($photo_data['gallery'])): ?>
-<input type="hidden" name="gallery" value="<?php echo $photo_data['gallery']; ?>" />
-<?php endif; ?>
-
-<div class="form-group">
-<label for="photo_thumbnail" class="col-md-2 control-label"><?php echo $lang['edit_photo_thumbnail']; ?></label>
-<div class="col-md-8">
-<div class="input-group">
-<input id="photo_thumbnail" class="form-control form-control" type="text" name="photo_thumbnail" value="<?php if(isset($photo_data['photo_thumbnail'])) echo $photo_data['photo_thumbnail']; ?>">
+    <ol class="breadcrumb">
+        <li><a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a></li>
+        <li>
+            <a href="index.php?mode=galleries&amp;edit=<?php echo $photo_data['gallery']; ?>"><?php echo str_replace('[gallery]', $photo_data['gallery'], $lang['edit_gallery']); ?></a>
+        </li>
+        <li class="active"><?php if (isset($photo_data['id'])) echo $lang['edit_photo']; else echo $lang['new_photo']; ?></li>
+    </ol>
+
+    <h1><?php if (isset($photo_data['id'])) echo $lang['edit_photo']; else echo $lang['new_photo']; ?></h1>
+
+    <?php include('errors.inc.tpl'); ?>
+
+
+    <form class="form-horizontal" role="form" action="index.php" method="post">
+        <div>
+            <input type="hidden" name="mode" value="galleries">
+            <input type="hidden" name="description_formatting" value="1">
+            <?php if (isset($photo_data['id'])): ?>
+                <input type="hidden" name="id" value="<?php echo $photo_data['id']; ?>"/>
+            <?php endif; ?>
+            <?php if (isset($photo_data['gallery'])): ?>
+                <input type="hidden" name="gallery" value="<?php echo $photo_data['gallery']; ?>"/>
+            <?php endif; ?>
+
+            <div class="form-group">
+                <label for="photo_thumbnail"
+                       class="col-md-2 control-label"><?php echo $lang['edit_photo_thumbnail']; ?></label>
+
+                <div class="col-md-8">
+                    <div class="input-group">
+                        <input id="photo_thumbnail" class="form-control form-control" type="text" name="photo_thumbnail"
+                               value="<?php if (isset($photo_data['photo_thumbnail'])) echo $photo_data['photo_thumbnail']; ?>">
 <span class="input-group-btn">
-<a class="btn btn-default" href="index.php?mode=modal&action=insert_raw_image" data-toggle="modal" data-target="#modal_raw_image" data-insert="#photo_thumbnail" data-keyboard="true" title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
+<a class="btn btn-default" href="index.php?mode=modal&action=insert_raw_image" data-toggle="modal"
+   data-target="#modal_raw_image" data-insert="#photo_thumbnail" data-keyboard="true"
+   title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
 </span>
-</div>
+                    </div>
 
-</div>
-</div>
+                </div>
+            </div>
 
-<div class="form-group">
-<label for="photo_normal" class="col-md-2 control-label"><?php echo $lang['edit_photo_normal']; ?></label>
-<div class="col-md-8">
-<div class="input-group">
-<input id="photo_normal" class="form-control" type="text" name="photo_normal" value="<?php if(isset($photo_data['photo_normal'])) echo $photo_data['photo_normal']; ?>">
+            <div class="form-group">
+                <label for="photo_normal"
+                       class="col-md-2 control-label"><?php echo $lang['edit_photo_normal']; ?></label>
+
+                <div class="col-md-8">
+                    <div class="input-group">
+                        <input id="photo_normal" class="form-control" type="text" name="photo_normal"
+                               value="<?php if (isset($photo_data['photo_normal'])) echo $photo_data['photo_normal']; ?>">
 <span class="input-group-btn">
-<a class="btn btn-default modal-invoker" href="index.php?mode=modal&action=insert_raw_image" data-toggle="modal" data-target="#modal_raw_image" data-insert="#photo_normal" data-keyboard="true" title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
+<a class="btn btn-default modal-invoker" href="index.php?mode=modal&action=insert_raw_image" data-toggle="modal"
+   data-target="#modal_raw_image" data-insert="#photo_normal" data-keyboard="true"
+   title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
 </span>
-</div>
-</div>
-</div>
+                    </div>
+                </div>
+            </div>
 
-<!--
+            <!--
 <div class="form-group">
 <label for="photo_large" class="col-md-2 control-label"><?php echo $lang['edit_photo_large']; ?></label>
 <div class="col-md-8">
-<input id="photo_large" class="form-control form-control-inline form-control-default" type="text" name="photo_large" value="<?php if(isset($photo_data['photo_large'])) echo $photo_data['photo_large']; ?>"> <a class="btn btn-default btn-xs modal-invoker" href="index.php?mode=modal&action=insert_gallery_image" data-toggle="modal" data-target="#image_modal" data-input="photo_large" data-keyboard="true" title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
+<input id="photo_large" class="form-control form-control-inline form-control-default" type="text" name="photo_large" value="<?php if (isset($photo_data['photo_large'])) echo $photo_data['photo_large']; ?>"> <a class="btn btn-default btn-xs modal-invoker" href="index.php?mode=modal&action=insert_gallery_image" data-toggle="modal" data-target="#image_modal" data-input="photo_large" data-keyboard="true" title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
 </div>
 </div>
 -->
 
-<div class="form-group">
-<label for="title" class="col-md-2 control-label"><?php echo $lang['edit_photo_title']; ?></label>
-<div class="col-md-8">
-<input id="title" class="form-control" type="text" name="title" value="<?php if(isset($photo_data['title'])) echo $photo_data['title']; ?>">
-</div>
-</div>
+            <div class="form-group">
+                <label for="title" class="col-md-2 control-label"><?php echo $lang['edit_photo_title']; ?></label>
 
-<div class="form-group">
-<label for="subtitle" class="col-md-2 control-label"><?php echo $lang['edit_photo_subtitle']; ?></label>
-<div class="col-md-8">
-<input id="subtitle" class="form-control" type="text" name="subtitle" value="<?php if(isset($photo_data['subtitle'])) echo $photo_data['subtitle']; ?>">
-</div>
-</div>
+                <div class="col-md-8">
+                    <input id="title" class="form-control" type="text" name="title"
+                           value="<?php if (isset($photo_data['title'])) echo $photo_data['title']; ?>">
+                </div>
+            </div>
 
-<div class="form-group">
-<label for="description" class="col-md-2 control-label"><?php echo $lang['edit_photo_description']; ?></label>
-<div class="col-md-8">
-<textarea id="description" class="form-control" name="description" cols="55" rows="13"><?php if(isset($photo_data['description'])) echo $photo_data['description']; ?></textarea></div>
-</div>
+            <div class="form-group">
+                <label for="subtitle" class="col-md-2 control-label"><?php echo $lang['edit_photo_subtitle']; ?></label>
 
-<div class="form-group">
-<div class="col-md-offset-2 col-md-8">
-<input type="submit" class="btn btn-primary" name="edit_photo_submitted" value="<?php echo $lang['submit_button_ok']; ?>">
-</div>
-</div>
+                <div class="col-md-8">
+                    <input id="subtitle" class="form-control" type="text" name="subtitle"
+                           value="<?php if (isset($photo_data['subtitle'])) echo $photo_data['subtitle']; ?>">
+                </div>
+            </div>
 
-</div>
-</form>
+            <div class="form-group">
+                <label for="description"
+                       class="col-md-2 control-label"><?php echo $lang['edit_photo_description']; ?></label>
+
+                <div class="col-md-8">
+                    <textarea id="description" class="form-control" name="description" cols="55"
+                              rows="13"><?php if (isset($photo_data['description'])) echo $photo_data['description']; ?></textarea>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-offset-2 col-md-8">
+                    <input type="submit" class="btn btn-primary" name="edit_photo_submitted"
+                           value="<?php echo $lang['submit_button_ok']; ?>">
+                </div>
+            </div>
+
+        </div>
+    </form>
 
 <?php endif; ?>
 
 <div class="modal fade" id="modal_raw_image" tabindex="-1">
-<div class="modal-dialog">
-<div class="modal-content">
-</div>
-</div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+        </div>
+    </div>
 </div>
diff --git a/cms/templates/admin/subtemplates/galleries_new.inc.tpl b/cms/templates/admin/subtemplates/galleries_new.inc.tpl
index 7ab002a..43b0dd8 100644
--- a/cms/templates/admin/subtemplates/galleries_new.inc.tpl
+++ b/cms/templates/admin/subtemplates/galleries_new.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a></li>
-<li class="active"><?php echo $lang['new_gallery']; ?></li>
+    <li><a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a></li>
+    <li class="active"><?php echo $lang['new_gallery']; ?></li>
 </ol>
 
 <h1><?php echo $lang['new_gallery']; ?></h1>
@@ -8,17 +8,18 @@
 <?php include('errors.inc.tpl'); ?>
 
 <form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="galleries" />
-  
-  <label for="new_gallery_name"><?php echo $lang['new_gallery_name']; ?></label>
-  
-  <div class="input-group form-control-default">
-  <input class="form-control" id="new_gallery_name" type="text" name="new_gallery_name" value="<?php if(isset($new_gallery_name)) echo $new_gallery_name; ?>" size="25" />
+    <div>
+        <input type="hidden" name="mode" value="galleries"/>
+
+        <label for="new_gallery_name"><?php echo $lang['new_gallery_name']; ?></label>
+
+        <div class="input-group form-control-default">
+            <input class="form-control" id="new_gallery_name" type="text" name="new_gallery_name"
+                   value="<?php if (isset($new_gallery_name)) echo $new_gallery_name; ?>" size="25"/>
   <span class="input-group-btn">
   <button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
   </span>
-  </div>
-  
- </div> 
+        </div>
+
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/galleries_properties.inc.tpl b/cms/templates/admin/subtemplates/galleries_properties.inc.tpl
index 406b11e..0399a64 100644
--- a/cms/templates/admin/subtemplates/galleries_properties.inc.tpl
+++ b/cms/templates/admin/subtemplates/galleries_properties.inc.tpl
@@ -1,28 +1,36 @@
-<h1><a href="index.php"><?php echo $lang['administration']; ?></a> &raquo; <a href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a> &raquo; <a href="index.php?mode=galleries&amp;edit=<?php echo $gallery; ?>"><?php echo str_replace('[gallery]',$gallery,$lang['edit_gallery']); ?></a> &raquo; <?php echo $lang['gallery_properties']; ?></h1>
-
-<form action="index.php" method="post"><div>
- <div>
-  <input type="hidden" name="mode" value="galleries" />
-  <input type="hidden" name="gallery" value="<?php echo $gallery_data['gallery']; ?>" />
-  <table class="admin-table" cellspacing="1" cellpadding="5" border="0">
-   <tr>
-    <td class="c"><label for="template"><?php echo $lang['specify_photo_tpl_m']; ?></label></td>
-    <td class="b">
-     <select id="template" name="template" size="1">
-      <?php foreach($available_photo_templates as $photo_template): ?>
-      <option value="<?php echo $photo_template; ?>"<?php if(isset($gallery_data['template']) && $gallery_data['template']==$photo_template): ?> selected="selected"<?php endif; ?>><?php echo $photo_template; ?></option>
-      <?php endforeach; ?>
-     </select>
-    </td>
-   </tr>
-   <tr>
-    <td class="c"><label for="photos_per_row"><?php echo $lang['photos_per_row']; ?></label></td>
-    <td class="b"><input type="text" id="photos_per_row" name="photos_per_row" value="<?php echo $gallery_data['photos_per_row']; ?>" size="5" /></td> 
-   </tr>
-   <tr>
-    <td class="c">&nbsp;</td>
-    <td class="b" style="text-align:right;"><input type="submit" name="gallery_properties_submit" value="<?php echo $lang['submit_button_ok']; ?>" /></td>
-   </tr>
-  </table>
- </div>
-</form>
+<h1><a href="index.php"><?php echo $lang['administration']; ?></a> &raquo; <a
+        href="index.php?mode=galleries"><?php echo $lang['photo_galleries']; ?></a> &raquo; <a
+        href="index.php?mode=galleries&amp;edit=<?php echo $gallery; ?>"><?php echo str_replace('[gallery]', $gallery, $lang['edit_gallery']); ?></a> &raquo; <?php echo $lang['gallery_properties']; ?>
+</h1>
+
+<form action="index.php" method="post">
+    <div>
+        <div>
+            <input type="hidden" name="mode" value="galleries"/>
+            <input type="hidden" name="gallery" value="<?php echo $gallery_data['gallery']; ?>"/>
+            <table class="admin-table" cellspacing="1" cellpadding="5" border="0">
+                <tr>
+                    <td class="c"><label for="template"><?php echo $lang['specify_photo_tpl_m']; ?></label></td>
+                    <td class="b">
+                        <select id="template" name="template" size="1">
+                            <?php foreach ($available_photo_templates as $photo_template): ?>
+                                <option
+                                    value="<?php echo $photo_template; ?>"<?php if (isset($gallery_data['template']) && $gallery_data['template'] == $photo_template): ?> selected="selected"<?php endif; ?>><?php echo $photo_template; ?></option>
+                            <?php endforeach; ?>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="c"><label for="photos_per_row"><?php echo $lang['photos_per_row']; ?></label></td>
+                    <td class="b"><input type="text" id="photos_per_row" name="photos_per_row"
+                                         value="<?php echo $gallery_data['photos_per_row']; ?>" size="5"/></td>
+                </tr>
+                <tr>
+                    <td class="c">&nbsp;</td>
+                    <td class="b" style="text-align:right;"><input type="submit" name="gallery_properties_submit"
+                                                                   value="<?php echo $lang['submit_button_ok']; ?>"/>
+                    </td>
+                </tr>
+            </table>
+        </div>
+</form>
diff --git a/cms/templates/admin/subtemplates/gcb.inc.tpl b/cms/templates/admin/subtemplates/gcb.inc.tpl
index 8368557..7852c70 100644
--- a/cms/templates/admin/subtemplates/gcb.inc.tpl
+++ b/cms/templates/admin/subtemplates/gcb.inc.tpl
@@ -1,40 +1,49 @@
 <div class="row">
-<div class="col-md-10">
-<h1><?php echo $lang['gcb']; ?></h1>
-</div>
-<div class="col-md-2">
-<a href="index.php?mode=gcb&amp;add_gcb=true" class="btn btn-success btn-top pull-right"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['add_gcb']; ?></a>
-</div>
+    <div class="col-md-10">
+        <h1><?php echo $lang['gcb']; ?></h1>
+    </div>
+    <div class="col-md-2">
+        <a href="index.php?mode=gcb&amp;add_gcb=true" class="btn btn-success btn-top pull-right"><span
+                class="glyphicon glyphicon-plus"></span> <?php echo $lang['add_gcb']; ?></a>
+    </div>
 </div>
 
-<?php if(isset($gcbs)): ?>
+<?php if (isset($gcbs)): ?>
 
-<div class="table-responsive">
-<table class="table table-striped table-hover">
-<thead>
-<tr>
-<th><?php echo $lang['gcb_identifier']; ?></th>
-<th><?php echo $lang['gcb_content']; ?></th>
-<th>&nbsp;</th>
-</tr>
-</thead>
-<tbody>
-<?php $i=0; foreach($gcbs as $gcb): ?>
-<tr>
-<td><?php echo $gcb['identifier']; ?></td>
-<td><?php echo $gcb['content']; ?></td>
-<td class="options nowrap"><a href="index.php?mode=gcb&amp;edit=<?php echo $gcb['id']; ?>" title="<?php echo $lang['edit']; ?>" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>&nbsp; <a href="index.php?mode=gcb&amp;delete=<?php echo $gcb['id']; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_gcb_confirm']); ?>" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
-</tr>
-<?php $i++; endforeach; ?>
-</tbody>
-</table>
-</div>
+    <div class="table-responsive">
+        <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+                <th><?php echo $lang['gcb_identifier']; ?></th>
+                <th><?php echo $lang['gcb_content']; ?></th>
+                <th>&nbsp;</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php $i = 0;
+            foreach ($gcbs as $gcb): ?>
+                <tr>
+                    <td><?php echo $gcb['identifier']; ?></td>
+                    <td><?php echo $gcb['content']; ?></td>
+                    <td class="options nowrap"><a href="index.php?mode=gcb&amp;edit=<?php echo $gcb['id']; ?>"
+                                                  title="<?php echo $lang['edit']; ?>"
+                                                  class="btn btn-primary btn-xs"><span
+                                class="glyphicon glyphicon-pencil"></span></a>&nbsp; <a
+                            href="index.php?mode=gcb&amp;delete=<?php echo $gcb['id']; ?>"
+                            title="<?php echo $lang['delete']; ?>"
+                            data-delete-confirm="<?php echo rawurlencode($lang['delete_gcb_confirm']); ?>"
+                            class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
+                </tr>
+                <?php $i++; endforeach; ?>
+            </tbody>
+        </table>
+    </div>
 
 <?php else: ?>
 
-<div class="alert alert-warning">
-<?php echo $lang['no_gcb']; ?>
-</div>
+    <div class="alert alert-warning">
+        <?php echo $lang['no_gcb']; ?>
+    </div>
 
 <?php endif; ?>
 
diff --git a/cms/templates/admin/subtemplates/gcb_delete.inc.tpl b/cms/templates/admin/subtemplates/gcb_delete.inc.tpl
index c7d3420..e1b0d59 100644
--- a/cms/templates/admin/subtemplates/gcb_delete.inc.tpl
+++ b/cms/templates/admin/subtemplates/gcb_delete.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=gcb"><?php echo $lang['gcb']; ?></a></li>
-<li class="active"><?php echo $lang['delete_gcb']; ?></li>
+    <li><a href="index.php?mode=gcb"><?php echo $lang['gcb']; ?></a></li>
+    <li class="active"><?php echo $lang['delete_gcb']; ?></li>
 </ol>
 
 <h1><?php echo $lang['delete_gcb']; ?></h1>
@@ -8,10 +8,11 @@
 <p><?php echo str_replace('[identifier]', $gcb['identifier'], $lang['delete_gcb_confirm']); ?></p>
 
 <form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="gcb" />
-  <input type="hidden" name="delete" value="<?php echo $gcb['id']; ?>" />
-  <input type="submit" name="confirmed" value="<?php echo $lang['submit_button_delete']; ?>" class="btn btn-danger btn-strong" />
- </div>
+    <div>
+        <input type="hidden" name="mode" value="gcb"/>
+        <input type="hidden" name="delete" value="<?php echo $gcb['id']; ?>"/>
+        <input type="submit" name="confirmed" value="<?php echo $lang['submit_button_delete']; ?>"
+               class="btn btn-danger btn-strong"/>
+    </div>
 </form>
 
diff --git a/cms/templates/admin/subtemplates/gcb_edit.inc.tpl b/cms/templates/admin/subtemplates/gcb_edit.inc.tpl
index b3995e3..4992202 100644
--- a/cms/templates/admin/subtemplates/gcb_edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/gcb_edit.inc.tpl
@@ -1,30 +1,35 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=gcb"><?php echo $lang['gcb']; ?></a></li>
-<li class="active"><?php if(isset($gcb['id'])): echo $lang['edit_gcb']; else: echo $lang['add_gcb']; endif; ?></li>
+    <li><a href="index.php?mode=gcb"><?php echo $lang['gcb']; ?></a></li>
+    <li class="active"><?php if (isset($gcb['id'])): echo $lang['edit_gcb'];
+        else: echo $lang['add_gcb']; endif; ?></li>
 </ol>
 
-<h1><?php if(isset($gcb['id'])): echo $lang['edit_gcb']; else: echo $lang['add_gcb']; endif; ?></h1>
+<h1><?php if (isset($gcb['id'])): echo $lang['edit_gcb'];
+    else: echo $lang['add_gcb']; endif; ?></h1>
 
 <?php include('errors.inc.tpl'); ?>
 
 <form action="index.php" method="post">
-<input type="hidden" name="mode" value="gcb" />
-<?php if(isset($gcb['id'])): ?>
-<input type="hidden" name="id" value="<?php echo $gcb['id']; ?>" />
-<?php endif; ?>
+    <input type="hidden" name="mode" value="gcb"/>
+    <?php if (isset($gcb['id'])): ?>
+        <input type="hidden" name="id" value="<?php echo $gcb['id']; ?>"/>
+    <?php endif; ?>
 
-<div class="form-group">
-<label for="identifier" class="control-label"><?php echo $lang['edit_gcb_identifier']; ?></label>
-<input type="text" name="identifier" value="<?php if(isset($gcb['identifier'])) echo $gcb['identifier']; ?>" size="40" class="form-control" />
-</div>
+    <div class="form-group">
+        <label for="identifier" class="control-label"><?php echo $lang['edit_gcb_identifier']; ?></label>
+        <input type="text" name="identifier" value="<?php if (isset($gcb['identifier'])) echo $gcb['identifier']; ?>"
+               size="40" class="form-control"/>
+    </div>
 
-<div class="form-group">
-<label for="content" class="control-label"><?php echo $lang['edit_gcb_content']; ?></label>
-<textarea name="content" cols="70" rows="20" class="form-control"><?php if(isset($gcb['content'])) echo $gcb['content']; ?></textarea>
-</div>
+    <div class="form-group">
+        <label for="content" class="control-label"><?php echo $lang['edit_gcb_content']; ?></label>
+        <textarea name="content" cols="70" rows="20"
+                  class="form-control"><?php if (isset($gcb['content'])) echo $gcb['content']; ?></textarea>
+    </div>
 
-<div class="form-group">
-<input type="submit" name="edit_gcb_submit" value="<?php echo $lang['submit_button_ok']; ?>"  class="btn btn-primary btn-strong" />
-</div>
+    <div class="form-group">
+        <input type="submit" name="edit_gcb_submit" value="<?php echo $lang['submit_button_ok']; ?>"
+               class="btn btn-primary btn-strong"/>
+    </div>
 
 </form>
diff --git a/cms/templates/admin/subtemplates/login.inc.tpl b/cms/templates/admin/subtemplates/login.inc.tpl
index a64bb39..d30f660 100644
--- a/cms/templates/admin/subtemplates/login.inc.tpl
+++ b/cms/templates/admin/subtemplates/login.inc.tpl
@@ -1,26 +1,26 @@
 <h1><?php echo $lang['login']; ?></h1>
 
-<?php if(isset($_GET['msg'])): ?>
-<div class="alert alert-danger">
-<strong><?php echo $lang['login_failed']; ?></strong>
-</div>
+<?php if (isset($_GET['msg'])): ?>
+    <div class="alert alert-danger">
+        <strong><?php echo $lang['login_failed']; ?></strong>
+    </div>
 <?php endif; ?>
 
 <form action="index.php" method="post">
-<fieldset>
-<div class="form-group login-form">
-<label for="login"><?php echo $lang['login_username']; ?></label>
-<input id="login" type="text" name="username" class="form-control" autofocus /></p>
-</div>
+    <fieldset>
+        <div class="form-group login-form">
+            <label for="login"><?php echo $lang['login_username']; ?></label>
+            <input id="login" type="text" name="username" class="form-control" autofocus/></p>
+        </div>
 
-<div class="form-group login-form">
-<label for="pw"><?php echo $lang['login_password']; ?></label>
-<input id="pw" type="password" name="userpw" class="form-control" />
-</div>
+        <div class="form-group login-form">
+            <label for="pw"><?php echo $lang['login_password']; ?></label>
+            <input id="pw" type="password" name="userpw" class="form-control"/>
+        </div>
 
-<input type="submit" class="btn btn-lg btn-primary" value="<?php echo $lang['login_submit']; ?>" />
+        <input type="submit" class="btn btn-lg btn-primary" value="<?php echo $lang['login_submit']; ?>"/>
 
-</fieldset>
+    </fieldset>
 </form>
 
 
diff --git a/cms/templates/admin/subtemplates/menus.inc.tpl b/cms/templates/admin/subtemplates/menus.inc.tpl
index e1c7366..13681ef 100644
--- a/cms/templates/admin/subtemplates/menus.inc.tpl
+++ b/cms/templates/admin/subtemplates/menus.inc.tpl
@@ -1,37 +1,51 @@
 <div class="row">
-<div class="col-sm-11">
-<h1><?php echo $lang['menus']; ?></h1>
-</div>
-<div class="col-sm-1">
-<a class="btn btn-success btn-top pull-right" href="index.php?mode=menus&amp;action=new"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['create_menu']; ?></a>
-</div>
+    <div class="col-sm-11">
+        <h1><?php echo $lang['menus']; ?></h1>
+    </div>
+    <div class="col-sm-1">
+        <a class="btn btn-success btn-top pull-right" href="index.php?mode=menus&amp;action=new"><span
+                class="glyphicon glyphicon-plus"></span> <?php echo $lang['create_menu']; ?></a>
+    </div>
 </div>
 
-<?php if(isset($menus)): ?>
+<?php if (isset($menus)): ?>
 
-<div class="table-responsive">
-<table class="table table-striped table-hover">
-<thead>
-<tr>
-<th><?php echo $lang['menu']; ?></th>
-<th>&nbsp;</th>
-</tr>
-</thead>
-<tbody>
-<?php $i=0; foreach($menus as $menu): ?>
-<tr>
-<td><?php echo $menu; ?></td>
-<td class="options nowrap"><a class="btn btn-primary btn-xs" href="index.php?mode=menus&amp;edit=<?php echo $menu; ?>" title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></a>
-<a class="btn btn-danger btn-xs" href="index.php?mode=menus&amp;delete=<?php echo $menu; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_menu_confirm']); ?>"><span class="glyphicon glyphicon-remove"></a>
-<?php if($menu==$settings['default_menu']): ?><span class="btn btn-success btn-xs" title="<?php echo $lang['default_menu']; ?>"><span class="glyphicon glyphicon-check"></span></span><?php else: ?><a class="btn btn-default btn-xs" href="index.php?mode=menus&amp;set_default=<?php echo $menu; ?>" title="<?php echo $lang['set_default_menu']; ?>"><span class="glyphicon glyphicon-unchecked"></span></a><?php endif; ?></td>
-</tr>
-<?php ++$i; endforeach; ?>
-</tbody>
-</table>
-</div>
+    <div class="table-responsive">
+        <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+                <th><?php echo $lang['menu']; ?></th>
+                <th>&nbsp;</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php $i = 0;
+            foreach ($menus as $menu): ?>
+                <tr>
+                    <td><?php echo $menu; ?></td>
+                    <td class="options nowrap"><a class="btn btn-primary btn-xs"
+                                                  href="index.php?mode=menus&amp;edit=<?php echo $menu; ?>"
+                                                  title="<?php echo $lang['edit']; ?>"><span
+                                class="glyphicon glyphicon-pencil"></a>
+                        <a class="btn btn-danger btn-xs" href="index.php?mode=menus&amp;delete=<?php echo $menu; ?>"
+                           title="<?php echo $lang['delete']; ?>"
+                           data-delete-confirm="<?php echo rawurlencode($lang['delete_menu_confirm']); ?>"><span
+                                class="glyphicon glyphicon-remove"></a>
+                        <?php if ($menu == $settings['default_menu']): ?><span class="btn btn-success btn-xs"
+                                                                               title="<?php echo $lang['default_menu']; ?>">
+                                <span class="glyphicon glyphicon-check"></span></span><?php else: ?><a
+                            class="btn btn-default btn-xs"
+                            href="index.php?mode=menus&amp;set_default=<?php echo $menu; ?>"
+                            title="<?php echo $lang['set_default_menu']; ?>"><span
+                                    class="glyphicon glyphicon-unchecked"></span></a><?php endif; ?></td>
+                </tr>
+                <?php ++$i; endforeach; ?>
+            </tbody>
+        </table>
+    </div>
 
 <?php else: ?>
 
-<p><?php echo $lang['no_menu']; ?></p>
+    <p><?php echo $lang['no_menu']; ?></p>
 
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/menus_delete.inc.tpl b/cms/templates/admin/subtemplates/menus_delete.inc.tpl
index e50a205..775f6f6 100644
--- a/cms/templates/admin/subtemplates/menus_delete.inc.tpl
+++ b/cms/templates/admin/subtemplates/menus_delete.inc.tpl
@@ -1,13 +1,13 @@
 <h1><?php echo $lang['delete_menu_headline']; ?></h1>
-
+
 <p><?php echo $lang['delete_menu_confirm']; ?></p>
 <p><?php echo $lang['delete_menu_name']; ?><b> <?php echo $menu; ?></b></p>
-
-<form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="menus" />
-  <input type="hidden" name="delete" value="<?php echo $menu; ?>" />
-  <input type="submit" name="confirmed" value="<?php echo $lang['delete_menu_submit']; ?>" />
- </div>
+
+<form action="index.php" method="post">
+    <div>
+        <input type="hidden" name="mode" value="menus"/>
+        <input type="hidden" name="delete" value="<?php echo $menu; ?>"/>
+        <input type="submit" name="confirmed" value="<?php echo $lang['delete_menu_submit']; ?>"/>
+    </div>
 </form>
-
+
diff --git a/cms/templates/admin/subtemplates/menus_edit.inc.tpl b/cms/templates/admin/subtemplates/menus_edit.inc.tpl
index 3f66202..4e70744 100644
--- a/cms/templates/admin/subtemplates/menus_edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/menus_edit.inc.tpl
@@ -1,74 +1,126 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=menus"><?php echo $lang['menus']; ?></a></li>
-<li class="active"><?php echo str_replace('[menu]', $menu, $lang['edit_menu_hl']); ?></li>
+    <li><a href="index.php?mode=menus"><?php echo $lang['menus']; ?></a></li>
+    <li class="active"><?php echo str_replace('[menu]', $menu, $lang['edit_menu_hl']); ?></li>
 </ol>
 
 <h1><?php echo str_replace('[menu]', $menu, $lang['edit_menu_hl']); ?></h1>
-     
+
 <form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="menus" />
-  <input type="hidden" name="menu" value="<?php echo $menu; ?>" />
-  <?php if(isset($edit_item)): ?>
-  <input type="hidden" name="edit_item" value="<?php echo $edit_item; ?>" />
-  <?php else: ?>
-  <input type="hidden" name="new_menu_item" value="true" />
-  <?php endif; ?>
-  <div class="table-responsive">
-  <table class="table table-striped table-hover">
-   <thead>
-    <tr> 
-     <th><?php echo $lang['menu_item_name']; ?></th>
-     <th><?php echo $lang['menu_item_title']; ?></th>
-     <th><?php echo $lang['menu_item_link']; ?></th>
-     <th><?php echo $lang['menu_item_section']; ?></th>
-     <th><?php echo $lang['menu_item_accesskey']; ?></th>
-     <th>&nbsp;</th>
-    </tr>
-   </thead>
-   <tbody<?php if(empty($edit_item)): ?> data-sortable="<?php echo BASE_URL; ?>cms/?mode=menus&amp;reorder_items=true"<?php endif; ?>>
+    <div>
+        <input type="hidden" name="mode" value="menus"/>
+        <input type="hidden" name="menu" value="<?php echo $menu; ?>"/>
+        <?php if (isset($edit_item)): ?>
+            <input type="hidden" name="edit_item" value="<?php echo $edit_item; ?>"/>
+        <?php else: ?>
+            <input type="hidden" name="new_menu_item" value="true"/>
+        <?php endif; ?>
+        <div class="table-responsive">
+            <table class="table table-striped table-hover">
+                <thead>
+                <tr>
+                    <th><?php echo $lang['menu_item_name']; ?></th>
+                    <th><?php echo $lang['menu_item_title']; ?></th>
+                    <th><?php echo $lang['menu_item_link']; ?></th>
+                    <th><?php echo $lang['menu_item_section']; ?></th>
+                    <th><?php echo $lang['menu_item_accesskey']; ?></th>
+                    <th>&nbsp;</th>
+                </tr>
+                </thead>
+                <tbody<?php if (empty($edit_item)): ?> data-sortable="<?php echo BASE_URL; ?>cms/?mode=menus&amp;reorder_items=true"<?php endif; ?>>
+
+                <?php if (isset($edit_item)): ?>
+                    <?php $i = 0;
+                    if (isset($items)): foreach ($items as $item): ?>
+                        <tr id="row_<?php echo $item['id']; ?>"
+                            class="<?php if ($i % 2 == 0): ?>a<?php else: ?>b<?php endif; ?>">
+                            <td><?php if ($item['id'] == $edit_item): ?>
+                                    <input class="form-control" type="text"
+                                           name="name"
+                                           value="<?php echo $item['name']; ?>"
+                                           size="10"
+                                           style="width:100%;" /><?php else: ?>
+                                    <span class="label label-default label-block"><?php echo $item['name']; ?></span><?php endif; ?>
+                            </td>
+                            <td><?php if ($item['id'] == $edit_item): ?>
+                                    <input class="form-control" type="text"
+                                           name="title"
+                                           value="<?php echo $item['title']; ?>"
+                                           size="10"
+                                           style="width:100%;" /><?php else: ?><?php echo $item['title']; ?><?php endif; ?>
+                            </td>
+                            <td><?php if ($item['id'] == $edit_item): ?>
+                                    <input class="form-control" type="text"
+                                           name="link"
+                                           value="<?php echo $item['link']; ?>"
+                                           size="10"
+                                           style="width:100%;" /><?php else: ?><?php echo $item['link']; ?><?php endif; ?>
+                            </td>
+                            <td><?php if ($item['id'] == $edit_item): ?>
+                                    <input class="form-control" type="text"
+                                           name="section"
+                                           value="<?php echo $item['section']; ?>"
+                                           size="10"
+                                           style="width:100%;" /><?php else: ?><?php echo $item['section']; ?><?php endif; ?>
+                            </td>
+                            <td><?php if ($item['id'] == $edit_item): ?>
+                                    <input class="form-control" type="text"
+                                           name="accesskey"
+                                           value="<?php echo $item['accesskey']; ?>"
+                                           size="10"
+                                           style="width:100%;" /><?php else: ?><?php echo $item['accesskey']; ?><?php endif; ?>
+                            </td>
+                            <td><?php if ($item['id'] == $edit_item): ?>
+                                    <input class="btn btn-primary" type="submit"
+                                           name="edit_menu_item_submitted"
+                                           value="<?php echo $lang['submit_button_ok']; ?>" /><?php else: ?>&nbsp;<?php endif; ?>
+                            </td>
+                        </tr>
+                        <?php ++$i; endforeach; endif; ?>
+
+                <?php else: ?>
+
+                <?php $i = 0;
+                if (isset($items)): foreach ($items as $item): ?>
+                    <tr id="item_<?php echo $item['id']; ?>">
+                        <td><span class="label label-default label-block"><?php echo $item['name']; ?></span></td>
+                        <td><?php echo $item['title']; ?></td>
+                        <td><?php echo $item['link']; ?></td>
+                        <td><?php echo $item['section']; ?></td>
+                        <td><?php echo $item['accesskey']; ?></td>
+                        <td class="options nowrap">
+                            <a class="btn btn-primary btn-xs"
+                               href="index.php?mode=menus&amp;action=edit_menu_item&amp;id=<?php echo $item['id']; ?>"
+                               title="<?php echo $lang['edit']; ?>">
+                               <span class="glyphicon glyphicon-pencil"></span></a>
+                            <a class="btn btn-danger btn-xs"
+                               href="index.php?mode=menus&amp;action=delete_menu_item&amp;id=<?php echo $item['id']; ?>"
+                               title="<?php echo $lang['delete']; ?>">
+                               <span class="glyphicon glyphicon-remove"></span></a>
+                            <span class="btn btn-success btn-xs sortable-handle"
+                                  title="<?php echo $lang['drag_and_drop']; ?>">
+                                <span class="glyphicon glyphicon-sort"></span></span>
+                            <!--<a href="index.php?mode=menus&amp;move_up=<?php echo $item['id']; ?>" title="<?php echo $lang['move_up']; ?>"><?php echo $lang['move_up']; ?></a><a href="index.php?mode=menus&amp;move_down=<?php echo $item['id']; ?>" title="<?php echo $lang['move_down']; ?>"><?php echo $lang['move_down']; ?></a>-->
+                        </td>
+                    </tr>
+                    <?php ++$i; endforeach; endif; ?>
+                </tbody>
+                <tr>
+                    <td><input class="form-control" type="text" name="name" value="" size="10"/></td>
+                    <td><input class="form-control" type="text" name="title" value="" size="10"/></td>
+                    <td><input class="form-control" type="text" name="link" value="" size="10"/></td>
+                    <td><input class="form-control" type="text" name="section" value="" size="10"/></td>
+                    <td><input class="form-control" type="text" name="accesskey" value="" size="3"/></td>
+                    <td class="options">
+                        <button class="btn btn-success"><span
+                                class="glyphicon glyphicon-plus"></span> <?php echo $lang['add_menu_item_submit']; ?>
+                        </button>
+                    </td>
+                </tr>
 
-    <?php if(isset($edit_item)): ?>
-    <?php $i=0; if(isset($items)): foreach($items as $item): ?>
-    <tr id="row_<?php echo $item['id']; ?>" class="<?php if($i%2==0): ?>a<?php else: ?>b<?php endif; ?>">
-     <td><?php if($item['id']==$edit_item): ?><input class="form-control" type="text" name="name" value="<?php echo $item['name']; ?>" size="10" style="width:100%;" /><?php else: ?><span class="label label-default label-block"><?php echo $item['name']; ?></span><?php endif; ?></td>
-     <td><?php if($item['id']==$edit_item): ?><input class="form-control" type="text" name="title" value="<?php echo $item['title']; ?>" size="10" style="width:100%;" /><?php else: ?><?php echo $item['title']; ?><?php endif; ?></td>
-     <td><?php if($item['id']==$edit_item): ?><input class="form-control" type="text" name="link" value="<?php echo $item['link']; ?>" size="10" style="width:100%;" /><?php else: ?><?php echo $item['link']; ?><?php endif; ?></td>
-     <td><?php if($item['id']==$edit_item): ?><input class="form-control" type="text" name="section" value="<?php echo $item['section']; ?>" size="10" style="width:100%;" /><?php else: ?><?php echo $item['section']; ?><?php endif; ?></td>
-     <td><?php if($item['id']==$edit_item): ?><input class="form-control" type="text" name="accesskey" value="<?php echo $item['accesskey']; ?>" size="10" style="width:100%;" /><?php else: ?><?php echo $item['accesskey']; ?><?php endif; ?></td>
-     <td><?php if($item['id']==$edit_item): ?><input class="btn btn-primary" type="submit" name="edit_menu_item_submitted" value="<?php echo $lang['submit_button_ok']; ?>" /><?php else: ?>&nbsp;<?php endif; ?></td>
-    </tr>
-    <?php ++$i; endforeach; endif; ?>
+                <?php endif; ?>
 
-    <?php else: ?>
 
-    <?php $i=0; if(isset($items)): foreach($items as $item): ?>
-    <tr id="item_<?php echo $item['id']; ?>">
-     <td><span class="label label-default label-block"><?php echo $item['name']; ?></span></td>
-     <td><?php echo $item['title']; ?></td>
-     <td><?php echo $item['link']; ?></td>
-     <td><?php echo $item['section']; ?></td>
-     <td><?php echo $item['accesskey']; ?></td>
-     <td class="options nowrap"><a class="btn btn-primary btn-xs" href="index.php?mode=menus&amp;action=edit_menu_item&amp;id=<?php echo $item['id']; ?>" title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
-     <a class="btn btn-danger btn-xs" href="index.php?mode=menus&amp;action=delete_menu_item&amp;id=<?php echo $item['id']; ?>" title="<?php echo $lang['delete']; ?>"><span class="glyphicon glyphicon-remove"></span></a>
-     <span class="btn btn-success btn-xs sortable-handle" title="<?php echo $lang['drag_and_drop']; ?>"><span class="glyphicon glyphicon-sort"></span></span>
-     <!--<a href="index.php?mode=menus&amp;move_up=<?php echo $item['id']; ?>" title="<?php echo $lang['move_up']; ?>"><?php echo $lang['move_up']; ?></a><a href="index.php?mode=menus&amp;move_down=<?php echo $item['id']; ?>" title="<?php echo $lang['move_down']; ?>"><?php echo $lang['move_down']; ?></a>--></td>
-    </tr>
-    <?php ++$i; endforeach; endif; ?>
-    </tbody>
-    <tr>
-     <td><input class="form-control" type="text" name="name" value="" size="10" /></td>
-     <td><input class="form-control" type="text" name="title" value="" size="10" /></td>
-     <td><input class="form-control" type="text" name="link" value="" size="10" /></td>
-     <td><input class="form-control" type="text" name="section" value="" size="10" /></td>
-     <td><input class="form-control" type="text" name="accesskey" value="" size="3" /></td>
-     <td class="options"><button class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['add_menu_item_submit']; ?></button></td>
-    </tr>
-    
-    <?php endif; ?>
-   
-   
-  </table>
-  </div>
- </div> 
+            </table>
+        </div>
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/menus_edit_item.inc.tpl b/cms/templates/admin/subtemplates/menus_edit_item.inc.tpl
index 54f58f1..eeb26dc 100644
--- a/cms/templates/admin/subtemplates/menus_edit_item.inc.tpl
+++ b/cms/templates/admin/subtemplates/menus_edit_item.inc.tpl
@@ -1,35 +1,44 @@
-<?php if(isset($menu_data)): ?>
-
-<h1><a href="index.php"><?php echo $lang['administration']; ?></a> &raquo; <a href="index.php?mode=menus"><?php echo $lang['menus']; ?></a> &raquo; <a href="index.php?mode=menus&amp;edit=<?php echo $menu_data['menu']; ?>"><?php echo str_replace('[menu]', $menu_data['menu'], $lang['edit_menu_hl']); ?></a> &raquo; <?php echo $lang['edit_menu_item']; ?></h1>
+<?php if (isset($menu_data)): ?>
 
-<form action="index.php" method="post">
- <div>
-  <input type="hidden" name="mode" value="menus" />
-  <input type="hidden" name="menu" value="<?php echo $menu_data['menu']; ?>" />
-  <input type="hidden" name="id" value="<?php echo $menu_data['id']; ?>" />
-  <table class="admin-table" cellspacing="1" cellpadding="5" border="0">
-   <tr>
-    <th><?php echo $lang['menu_item_name']; ?></th>
-    <th><?php echo $lang['menu_item_title']; ?></th>
-    <th><?php echo $lang['menu_item_link']; ?></th>
-    <th><?php echo $lang['menu_item_section']; ?></th>
-    <th><?php echo $lang['menu_item_accesskey']; ?></th>
-    <th>&nbsp;</th>
-   </tr>
-   <tr>
-    <td class="a"><input type="text" name="name" value="<?php echo $menu_data['name']; ?>" size="10" style="width:100%;" /></td>
-    <td><input type="text" name="title" value="<?php echo $menu_data['title']; ?>" size="10" style="width:100%;" /></td>
-    <td><input type="text" name="link" value="<?php echo $menu_data['link']; ?>" size="10" style="width:100%;" /></td>
-    <td><input type="text" name="section" value="<?php echo $menu_data['section']; ?>" size="10" style="width:100%;" /></td>
-    <td><input type="text" name="accesskey" value="<?php echo $menu_data['accesskey']; ?>" size="3" style="width:100%;" /></td>
-    <td><input type="submit" name="edit_menu_item_submitted" value="<?php echo $lang['submit_button_ok']; ?>" /></td>
-   </tr>
-  </table>
- </div>
-</form>
-
-<?php else: ?>
-       
-<p><?php echo $lang['menu_item_doesnt_exist']; ?></p>
-
-<?php endif; ?>
+    <h1><a href="index.php"><?php echo $lang['administration']; ?></a> &raquo; <a
+            href="index.php?mode=menus"><?php echo $lang['menus']; ?></a> &raquo; <a
+            href="index.php?mode=menus&amp;edit=<?php echo $menu_data['menu']; ?>"><?php echo str_replace('[menu]', $menu_data['menu'], $lang['edit_menu_hl']); ?></a> &raquo; <?php echo $lang['edit_menu_item']; ?>
+    </h1>
+
+    <form action="index.php" method="post">
+        <div>
+            <input type="hidden" name="mode" value="menus"/>
+            <input type="hidden" name="menu" value="<?php echo $menu_data['menu']; ?>"/>
+            <input type="hidden" name="id" value="<?php echo $menu_data['id']; ?>"/>
+            <table class="admin-table" cellspacing="1" cellpadding="5" border="0">
+                <tr>
+                    <th><?php echo $lang['menu_item_name']; ?></th>
+                    <th><?php echo $lang['menu_item_title']; ?></th>
+                    <th><?php echo $lang['menu_item_link']; ?></th>
+                    <th><?php echo $lang['menu_item_section']; ?></th>
+                    <th><?php echo $lang['menu_item_accesskey']; ?></th>
+                    <th>&nbsp;</th>
+                </tr>
+                <tr>
+                    <td class="a"><input type="text" name="name" value="<?php echo $menu_data['name']; ?>" size="10"
+                                         style="width:100%;"/></td>
+                    <td><input type="text" name="title" value="<?php echo $menu_data['title']; ?>" size="10"
+                               style="width:100%;"/></td>
+                    <td><input type="text" name="link" value="<?php echo $menu_data['link']; ?>" size="10"
+                               style="width:100%;"/></td>
+                    <td><input type="text" name="section" value="<?php echo $menu_data['section']; ?>" size="10"
+                               style="width:100%;"/></td>
+                    <td><input type="text" name="accesskey" value="<?php echo $menu_data['accesskey']; ?>" size="3"
+                               style="width:100%;"/></td>
+                    <td><input type="submit" name="edit_menu_item_submitted"
+                               value="<?php echo $lang['submit_button_ok']; ?>"/></td>
+                </tr>
+            </table>
+        </div>
+    </form>
+
+<?php else: ?>
+
+    <p><?php echo $lang['menu_item_doesnt_exist']; ?></p>
+
+<?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/menus_new.inc.tpl b/cms/templates/admin/subtemplates/menus_new.inc.tpl
index 006ad61..f0567c9 100644
--- a/cms/templates/admin/subtemplates/menus_new.inc.tpl
+++ b/cms/templates/admin/subtemplates/menus_new.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=menus"><?php echo $lang['menus']; ?></a></a></li>
-<li class="active"><?php echo $lang['new_menu_hl']; ?></li>
+    <li><a href="index.php?mode=menus"><?php echo $lang['menus']; ?></a></a></li>
+    <li class="active"><?php echo $lang['new_menu_hl']; ?></li>
 </ol>
 
 <h1><?php echo $lang['new_menu_hl']; ?></h1>
@@ -8,15 +8,17 @@
 <?php include('errors.inc.tpl'); ?>
 
 <form action="index.php" method="post">
-<div>
-<input type="hidden" name="mode" value="menus" />
-<label for="new_menu_name"><?php echo $lang['new_menu_name']; ?></label>
-<div class="input-group form-control-default">
-<input class="form-control" id="new_menu_name" type="text" name="new_menu_name" value="<?php if(isset($new_menu_name)) echo $new_menu_name; ?>" size="25" />
-<span class="input-group-btn">
-<button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
-</span>
-</div>
-</div>
+    <div>
+        <input type="hidden" name="mode" value="menus"/>
+        <label for="new_menu_name"><?php echo $lang['new_menu_name']; ?></label>
+
+        <div class="input-group form-control-default">
+            <input class="form-control" id="new_menu_name" type="text" name="new_menu_name"
+                   value="<?php if (isset($new_menu_name)) echo $new_menu_name; ?>" size="25"/>
+            <span class="input-group-btn">
+            <button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
+            </span>
+        </div>
+    </div>
 </form>
 
diff --git a/cms/templates/admin/subtemplates/modal_insert_gallery.tpl b/cms/templates/admin/subtemplates/modal_insert_gallery.tpl
index b99bfed..1ead50b 100644
--- a/cms/templates/admin/subtemplates/modal_insert_gallery.tpl
+++ b/cms/templates/admin/subtemplates/modal_insert_gallery.tpl
@@ -1,34 +1,36 @@
 <div class="modal-header">
-<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-<h4 class="modal-title"><?php echo $lang['insert_gallery_label']; ?></h4>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h4 class="modal-title"><?php echo $lang['insert_gallery_label']; ?></h4>
 </div>
 <div class="modal-body">
 
-<?php if(isset($galleries)): ?>
-<div class="form-group">
-<select id="galleryselect" class="form-control" name="gallery" size="20">
-</div>
-<?php foreach($galleries as $gallery): ?>
-<option value="<?php echo $gallery; ?>"<?php if(isset($selected_gallery) && $selected_gallery==$gallery): ?> selected="selected"<?php endif; ?>><?php echo $gallery; ?></option>
-<?php endforeach; ?>
-</select>
-<?php endif; ?>
+    <?php if (isset($galleries)): ?>
+        <div class="form-group">
+            <select id="galleryselect" class="form-control" name="gallery" size="20">
+        </div>
+        <?php foreach ($galleries as $gallery): ?>
+            <option
+                value="<?php echo $gallery; ?>"<?php if (isset($selected_gallery) && $selected_gallery == $gallery): ?> selected="selected"<?php endif; ?>><?php echo $gallery; ?></option>
+        <?php endforeach; ?>
+        </select>
+    <?php endif; ?>
 
 </div>
 <div class="modal-footer">
-<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
-<button id="insert-gallery" type="button" class="btn btn-primary"><?php echo $lang['insert_gallery_label']; ?></button>
+    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
+    <button id="insert-gallery" type="button"
+            class="btn btn-primary"><?php echo $lang['insert_gallery_label']; ?></button>
 </div>
 <script>
-$(function() {
-$("#galleryselect option").dblclick( function(e) { 
-                                                 $("#insert-gallery").click (); 
-                                               });
-$("#insert-gallery").click(function(e) { 
-                                         if(gallery = $("#galleryselect option:selected").val())
-                                          {
-                                           $($insertField).insertAtCaret("[gallery:"+gallery+"]");
-                                          }
-                                         $('#modal_gallery').modal('hide'); });
-});
+    $(function () {
+        $("#galleryselect option").dblclick(function (e) {
+            $("#insert-gallery").click();
+        });
+        $("#insert-gallery").click(function (e) {
+            if (gallery = $("#galleryselect option:selected").val()) {
+                $($insertField).insertAtCaret("[gallery:" + gallery + "]");
+            }
+            $('#modal_gallery').modal('hide');
+        });
+    });
 </script>
diff --git a/cms/templates/admin/subtemplates/modal_insert_image.tpl b/cms/templates/admin/subtemplates/modal_insert_image.tpl
index 4087cc1..cb17019 100644
--- a/cms/templates/admin/subtemplates/modal_insert_image.tpl
+++ b/cms/templates/admin/subtemplates/modal_insert_image.tpl
@@ -1,47 +1,49 @@
 <div class="modal-header">
-<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-<h4 class="modal-title"><?php echo $lang['insert_image']; ?></h4>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h4 class="modal-title"><?php echo $lang['insert_image']; ?></h4>
 </div>
 <div class="modal-body">
 
-<?php if(isset($images)): ?>
-<div class="form-group">
-<select id="imageselect" class="form-control" size="20">
-<?php foreach($images as $image): ?>
-<option value="<?php echo $image; ?>" ondblclick="image_popup('<?php echo BASE_URL.MEDIA_DIR.$image; ?>')"><?php echo $image; ?></option>
-<?php endforeach; ?>
-</select>
-</div>
-<div class="form-group">
-<label for="image_class"><?php echo $lang['insert_image_class']; ?></label>
-<input id="image_class" class="form-control" type="text" name="image_class" value="<?php echo $settings['default_image_class']; ?>">
-</div>
-<?php else: ?>
-<div class="alert alert-warning">
-<p><?php echo $lang['no_images']; ?></p>
-</div>
-<?php endif; ?>
+    <?php if (isset($images)): ?>
+        <div class="form-group">
+            <select id="imageselect" class="form-control" size="20">
+                <?php foreach ($images as $image): ?>
+                    <option value="<?php echo $image; ?>"
+                            ondblclick="image_popup('<?php echo BASE_URL . MEDIA_DIR . $image; ?>')"><?php echo $image; ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+        <div class="form-group">
+            <label for="image_class"><?php echo $lang['insert_image_class']; ?></label>
+            <input id="image_class" class="form-control" type="text" name="image_class"
+                   value="<?php echo $settings['default_image_class']; ?>">
+        </div>
+    <?php else: ?>
+        <div class="alert alert-warning">
+            <p><?php echo $lang['no_images']; ?></p>
+        </div>
+    <?php endif; ?>
 
 </div>
 <div class="modal-footer">
-<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
-<?php if(isset($images)): ?>
-<button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_image_button']; ?></button>
-<?php endif; ?>
+    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
+    <?php if (isset($images)): ?>
+        <button id="insert-image" type="button"
+                class="btn btn-primary"><?php echo $lang['insert_image_button']; ?></button>
+    <?php endif; ?>
 </div>
 <script>
-$(function() {
-$("#imageselect option").dblclick( function(e) { 
-                                                 $("#insert-image").click (); 
-                                               });
-$("#insert-image").click(function(e) {
-                                       if(gallery = $("#imageselect option:selected").val())
-                                        {
-                                         if(image_class = $("#image_class").val()) imageCode = "[image:"+gallery+"|"+image_class+"]";
-                                         else imageCode = "[image:"+gallery+"]";
-                                         $($insertField).insertAtCaret(imageCode);
-                                        }
-                                       $('#modal_image').modal('hide');
-                                     });
-});
+    $(function () {
+        $("#imageselect option").dblclick(function (e) {
+            $("#insert-image").click();
+        });
+        $("#insert-image").click(function (e) {
+            if (gallery = $("#imageselect option:selected").val()) {
+                if (image_class = $("#image_class").val()) imageCode = "[image:" + gallery + "|" + image_class + "]";
+                else imageCode = "[image:" + gallery + "]";
+                $($insertField).insertAtCaret(imageCode);
+            }
+            $('#modal_image').modal('hide');
+        });
+    });
 </script>
diff --git a/cms/templates/admin/subtemplates/modal_insert_raw_image.tpl b/cms/templates/admin/subtemplates/modal_insert_raw_image.tpl
index 9a9a2b4..1242a63 100644
--- a/cms/templates/admin/subtemplates/modal_insert_raw_image.tpl
+++ b/cms/templates/admin/subtemplates/modal_insert_raw_image.tpl
@@ -1,36 +1,36 @@
 <div class="modal-header">
-<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-<h4 class="modal-title"><?php echo $lang['insert_image']; ?></h4>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h4 class="modal-title"><?php echo $lang['insert_image']; ?></h4>
 </div>
 <div class="modal-body">
 
-<?php if(isset($images)): ?>
+    <?php if (isset($images)): ?>
 
 
-  <select id="imageselect" size="20" style="width:100%;">
-  <?php foreach($images as $image): ?>
-  <option value="<?php echo $image; ?>"><?php echo $image; ?></option>
-  <?php endforeach; ?>
-  </select>
+        <select id="imageselect" size="20" style="width:100%;">
+            <?php foreach ($images as $image): ?>
+                <option value="<?php echo $image; ?>"><?php echo $image; ?></option>
+            <?php endforeach; ?>
+        </select>
 
 
-<?php else: ?>
-<p><em><?php echo $lang['no_images']; ?></em></p>
-<?php endif; ?>
+    <?php else: ?>
+        <p><em><?php echo $lang['no_images']; ?></em></p>
+    <?php endif; ?>
 
 </div>
 <div class="modal-footer">
-<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
-<button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_image_button']; ?></button>
+    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
+    <button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_image_button']; ?></button>
 </div>
 <script>
-$(function() {
-$("#imageselect option").dblclick( function(e) { 
-                                                 $("#insert-image").click (); 
-                                               });
-$("#insert-image").click(function(e) { 
-                                       if(val = $("#imageselect option:selected").val()) $($insertField).val(val);
-                                       $('#modal_raw_image').modal('hide');
-                                     });
-});
+    $(function () {
+        $("#imageselect option").dblclick(function (e) {
+            $("#insert-image").click();
+        });
+        $("#insert-image").click(function (e) {
+            if (val = $("#imageselect option:selected").val()) $($insertField).val(val);
+            $('#modal_raw_image').modal('hide');
+        });
+    });
 </script>
diff --git a/cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl b/cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl
index da29bce..bc98db4 100644
--- a/cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl
+++ b/cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl
@@ -1,46 +1,49 @@
 <div class="modal-header">
-<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-<h4 class="modal-title"><?php echo $lang['insert_thumbnail']; ?></h4>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h4 class="modal-title"><?php echo $lang['insert_thumbnail']; ?></h4>
 </div>
 <div class="modal-body">
-<?php if(isset($thumbnails)): ?>
-<div class="form-group">
-<select id="thumbnailselect" class="form-control" size="20">
-<?php foreach($thumbnails as $thumbnail): ?>
-<option value="<?php echo $thumbnail['id']; ?>"><?php echo $thumbnail['title']; ?> (<?php echo $thumbnail['gallery']; ?>)</option>
-<?php endforeach; ?>
-</select>
-</div>
-<div class="form-group">
-<label for="image_class"><?php echo $lang['insert_image_class']; ?></label>
-<input id="image_class" class="form-control" type="text" name="image_class" value="<?php echo $settings['default_thumbnail_class']; ?>">
-</div>
-<?php else: ?>
-<div class="alert alert-warning">
-<p><?php echo $lang['no_images']; ?></p>
-</div>
-<?php endif; ?>
+    <?php if (isset($thumbnails)): ?>
+        <div class="form-group">
+            <select id="thumbnailselect" class="form-control" size="20">
+                <?php foreach ($thumbnails as $thumbnail): ?>
+                    <option value="<?php echo $thumbnail['id']; ?>"><?php echo $thumbnail['title']; ?>
+                        (<?php echo $thumbnail['gallery']; ?>)
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+        <div class="form-group">
+            <label for="image_class"><?php echo $lang['insert_image_class']; ?></label>
+            <input id="image_class" class="form-control" type="text" name="image_class"
+                   value="<?php echo $settings['default_thumbnail_class']; ?>">
+        </div>
+    <?php else: ?>
+        <div class="alert alert-warning">
+            <p><?php echo $lang['no_images']; ?></p>
+        </div>
+    <?php endif; ?>
 
 </div>
 <div class="modal-footer">
-<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
-<?php if(isset($thumbnails)): ?>
-<button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_thumbnail_button']; ?></button>
-<?php endif; ?>
+    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
+    <?php if (isset($thumbnails)): ?>
+        <button id="insert-image" type="button"
+                class="btn btn-primary"><?php echo $lang['insert_thumbnail_button']; ?></button>
+    <?php endif; ?>
 </div>
 <script>
-$(function() {
-$("#thumbnailselect option").dblclick( function(e) { 
-                                                 $("#insert-image").click (); 
-                                               });
-$("#insert-image").click(function(e) { 
-                                       if(thumbnail = $("#thumbnailselect option:selected").val())
-                                        {
-                                         if(imageClass = $("#image_class").val()) imageCode = "[thumbnail:"+thumbnail+"|"+imageClass+"]";
-                                         else imageCode = "[image:"+thumbnail+"]";
-                                         $($insertField).insertAtCaret(imageCode);
-                                        }
-                                       $('#modal_thumbnail').modal('hide');
-                                     });
-});
+    $(function () {
+        $("#thumbnailselect option").dblclick(function (e) {
+            $("#insert-image").click();
+        });
+        $("#insert-image").click(function (e) {
+            if (thumbnail = $("#thumbnailselect option:selected").val()) {
+                if (imageClass = $("#image_class").val()) imageCode = "[thumbnail:" + thumbnail + "|" + imageClass + "]";
+                else imageCode = "[image:" + thumbnail + "]";
+                $($insertField).insertAtCaret(imageCode);
+            }
+            $('#modal_thumbnail').modal('hide');
+        });
+    });
 </script>
diff --git a/cms/templates/admin/subtemplates/notes.inc.tpl b/cms/templates/admin/subtemplates/notes.inc.tpl
index 5405419..d4ba292 100644
--- a/cms/templates/admin/subtemplates/notes.inc.tpl
+++ b/cms/templates/admin/subtemplates/notes.inc.tpl
@@ -1,38 +1,48 @@
 <div class="row">
-<div class="col-md-10">
-<h1><?php echo $lang['notes']; ?></h1>
-</div>
-<div class="col-md-2">
-<a class="btn btn-success btn-top pull-right" href="index.php?mode=notes&amp;action=new"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['create_note_section']; ?></a>
-</div>
+    <div class="col-md-10">
+        <h1><?php echo $lang['notes']; ?></h1>
+    </div>
+    <div class="col-md-2">
+        <a class="btn btn-success btn-top pull-right" href="index.php?mode=notes&amp;action=new"><span
+                class="glyphicon glyphicon-plus"></span> <?php echo $lang['create_note_section']; ?></a>
+    </div>
 </div>
 
-<?php if(isset($note_sections)): ?>
+<?php if (isset($note_sections)): ?>
+
+    <div class="table-responsive">
+        <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+                <th><?php echo $lang['note_section']; ?></th>
+                <th colspan="2">&nbsp;</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php $i = 0;
+            foreach ($note_sections as $note_section): ?>
+                <tr>
+                    <td><?php echo $note_section; ?></td>
+                    <td class="nobreak options">
+                        <a class="btn btn-primary btn-xs"
+                           href="index.php?mode=notes&amp;edit=<?php echo $note_section; ?>"
+                           title="<?php echo $lang['edit']; ?>">
+                           <span class="glyphicon glyphicon-pencil"></span></a>
+                        <a class="btn btn-danger btn-xs"
+                           href="index.php?mode=notes&amp;delete=<?php echo $note_section; ?>"
+                           title="<?php echo $lang['delete']; ?>"
+                           data-delete-confirm="<?php echo rawurlencode($lang['delete_this_note_section']); ?>">
+                           <span class="glyphicon glyphicon-remove"></span></a></td>
+                </tr>
+                <?php $i++; endforeach; ?>
+            <tbody>
+        </table>
+    </div>
 
-<div class="table-responsive">
-<table class="table table-striped table-hover">
- <thead>
- <tr>
-  <th><?php echo $lang['note_section']; ?></th>
-  <th colspan="2">&nbsp;</th>
- </tr>
- </thead>
- <tbody>
- <?php $i=0; foreach($note_sections as $note_section): ?>
- <tr>
-  <td><?php echo $note_section; ?></td>
-  <td class="nobreak options"><a class="btn btn-primary btn-xs" href="index.php?mode=notes&amp;edit=<?php echo $note_section; ?>" title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
-  <a class="btn btn-danger btn-xs" href="index.php?mode=notes&amp;delete=<?php echo $note_section; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_this_note_section']); ?>"><span class="glyphicon glyphicon-remove"></span></a></td>
- </tr>
- <?php $i++; endforeach; ?>
- <tbody>
-</table>
-</div>
-       
 <?php else: ?>
 
-<div class="alert alert-warning">
-<?php echo $lang['no_note_sections']; ?></em></p>
-</div>
+    <div class="alert alert-warning">
+        <?php echo $lang['no_note_sections']; ?></em></p>
+    </div>
 
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/notes_delete_section.inc.tpl b/cms/templates/admin/subtemplates/notes_delete_section.inc.tpl
index 7177424..5b4fbac 100644
--- a/cms/templates/admin/subtemplates/notes_delete_section.inc.tpl
+++ b/cms/templates/admin/subtemplates/notes_delete_section.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=notes"><?php echo $lang['notes']; ?></a></li>
-<li class="active"><?php echo $lang['delete_note_section']; ?></li>
+    <li><a href="index.php?mode=notes"><?php echo $lang['notes']; ?></a></li>
+    <li class="active"><?php echo $lang['delete_note_section']; ?></li>
 </ol>
 
 <h1><?php echo $lang['delete_note_section']; ?></h1>
@@ -8,9 +8,10 @@
 <p><?php echo str_replace('[note_section]', $note_section, $lang['delete_note_section_confirm']); ?></p>
 
 <form action="index.php" method="post">
-<div>
-<input type="hidden" name="mode" value="notes" />
-<input type="hidden" name="delete" value="<?php echo $note_section; ?>" />
-<input class="btn btn-danger btn-lg" type="submit" name="confirmed" value="<?php echo $lang['delete_note_section_submit']; ?>" />
-</div>
+    <div>
+        <input type="hidden" name="mode" value="notes"/>
+        <input type="hidden" name="delete" value="<?php echo $note_section; ?>"/>
+        <input class="btn btn-danger btn-lg" type="submit" name="confirmed"
+               value="<?php echo $lang['delete_note_section_submit']; ?>"/>
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/notes_edit_note.inc.tpl b/cms/templates/admin/subtemplates/notes_edit_note.inc.tpl
index 9233e94..983789e 100644
--- a/cms/templates/admin/subtemplates/notes_edit_note.inc.tpl
+++ b/cms/templates/admin/subtemplates/notes_edit_note.inc.tpl
@@ -1,60 +1,67 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=notes"><?php echo $lang['notes']; ?></a></li>
-<li><a href="index.php?mode=notes&amp;edit=<?php echo $note['note_section']; ?>"><?php echo $lang['notes']; ?>: <?php echo $note['note_section']; ?></a></li>
-<li class="active">
-<?php if(isset($note['id'])): ?>
-<?php echo $lang['edit_note']; ?>
-<?php else: ?>
-<?php echo $lang['add_note']; ?>
-<?php endif; ?></li>
+    <li><a href="index.php?mode=notes"><?php echo $lang['notes']; ?></a></li>
+    <li><a href="index.php?mode=notes&amp;edit=<?php echo $note['note_section']; ?>"><?php echo $lang['notes']; ?>
+            : <?php echo $note['note_section']; ?></a></li>
+    <li class="active">
+        <?php if (isset($note['id'])): ?>
+            <?php echo $lang['edit_note']; ?>
+        <?php else: ?>
+            <?php echo $lang['add_note']; ?>
+        <?php endif; ?></li>
 </ol>
 
 <h1>
-<?php if(isset($note['id'])): ?>
-<?php echo $lang['edit_note']; ?>
-<?php else: ?>
-<?php echo $lang['add_note']; ?>
-<?php endif; ?>
+    <?php if (isset($note['id'])): ?>
+        <?php echo $lang['edit_note']; ?>
+    <?php else: ?>
+        <?php echo $lang['add_note']; ?>
+    <?php endif; ?>
 </h1>
 
 <?php include('errors.inc.tpl'); ?>
 
 <form action="index.php" method="post" name="notesform">
-<div>
-<input type="hidden" name="mode" value="notes">
-<input type="hidden" name="text_formatting" value="0">
-<input type="hidden" name="edit_note_submit" value="true">
-<?php if(isset($note['id'])): ?>
-<input type="hidden" name="id" value="<?php echo $note['id']; ?>" />
-<?php endif; ?>
-<input type="hidden" name="note_section" value="<?php echo $note['note_section']; ?>" />
-
-<div class="form-group">
-<label for="title"><?php echo $lang['edit_note_title']; ?></label>
-<input id="title" class="form-control" type="text" name="title" value="<?php if(isset($note['title'])) echo $note['title']; ?>">
-</div>
-
-<div class="form-group">
-<label for="text"><?php echo $lang['edit_note_text']; ?></label>
-<textarea id="text" class="form-control" name="text" rows="10"><?php if(isset($note['text'])) echo $note['text']; ?></textarea>
-</div>
-
-<div class="form-group">
-<label for="link"><?php echo $lang['edit_note_link']; ?></label>
-<input id="link" class="form-control" type="text" name="link" value="<?php if(isset($note['link'])) echo $note['link']; ?>">
-</div>
-
-<div class="form-group">
-<label for="linkname"><?php echo $lang['edit_note_linkname']; ?></label>
-<input id="linkname" class="form-control" type="text" name="linkname" value="<?php if(isset($note['linkname'])) echo $note['linkname']; ?>">
-</div>
-
-<div class="form-group">
-<label for="time"><?php echo $lang['edit_note_date_marking']; ?></label>
-<input id="time" class="form-control" type="text" name="time" value="<?php if(isset($note['time'])) echo $note['time']; ?>" placeholder="<?php echo $lang['edit_time_format']; ?>">
-</div>
-
-<button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
- 
-</div>
+    <div>
+        <input type="hidden" name="mode" value="notes">
+        <input type="hidden" name="text_formatting" value="0">
+        <input type="hidden" name="edit_note_submit" value="true">
+        <?php if (isset($note['id'])): ?>
+            <input type="hidden" name="id" value="<?php echo $note['id']; ?>"/>
+        <?php endif; ?>
+        <input type="hidden" name="note_section" value="<?php echo $note['note_section']; ?>"/>
+
+        <div class="form-group">
+            <label for="title"><?php echo $lang['edit_note_title']; ?></label>
+            <input id="title" class="form-control" type="text" name="title"
+                   value="<?php if (isset($note['title'])) echo $note['title']; ?>">
+        </div>
+
+        <div class="form-group">
+            <label for="text"><?php echo $lang['edit_note_text']; ?></label>
+            <textarea id="text" class="form-control" name="text"
+                      rows="10"><?php if (isset($note['text'])) echo $note['text']; ?></textarea>
+        </div>
+
+        <div class="form-group">
+            <label for="link"><?php echo $lang['edit_note_link']; ?></label>
+            <input id="link" class="form-control" type="text" name="link"
+                   value="<?php if (isset($note['link'])) echo $note['link']; ?>">
+        </div>
+
+        <div class="form-group">
+            <label for="linkname"><?php echo $lang['edit_note_linkname']; ?></label>
+            <input id="linkname" class="form-control" type="text" name="linkname"
+                   value="<?php if (isset($note['linkname'])) echo $note['linkname']; ?>">
+        </div>
+
+        <div class="form-group">
+            <label for="time"><?php echo $lang['edit_note_date_marking']; ?></label>
+            <input id="time" class="form-control" type="text" name="time"
+                   value="<?php if (isset($note['time'])) echo $note['time']; ?>"
+                   placeholder="<?php echo $lang['edit_time_format']; ?>">
+        </div>
+
+        <button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
+
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/notes_edit_section.inc.tpl b/cms/templates/admin/subtemplates/notes_edit_section.inc.tpl
index ed20bd1..80a8e95 100644
--- a/cms/templates/admin/subtemplates/notes_edit_section.inc.tpl
+++ b/cms/templates/admin/subtemplates/notes_edit_section.inc.tpl
@@ -1,41 +1,58 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=notes"><?php echo $lang['notes']; ?></a></li>
-<li class="active"><?php echo $lang['notes']; ?>: <?php echo $note_section; ?></li>
+    <li><a href="index.php?mode=notes"><?php echo $lang['notes']; ?></a></li>
+    <li class="active"><?php echo $lang['notes']; ?>: <?php echo $note_section; ?></li>
 </ol>
 
 <div class="row">
-<div class="col-md-10">
-<h1><?php echo $lang['notes']; ?>: <?php echo $note_section; ?></h1>
-</div>
-<div class="col-md-2">
-<a class="btn btn-success btn-top pull-right" href="index.php?mode=notes&amp;add_note=<?php echo $note_section; ?>"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['add_note']; ?></a>
-</div>
+    <div class="col-md-10">
+        <h1><?php echo $lang['notes']; ?>: <?php echo $note_section; ?></h1>
+    </div>
+    <div class="col-md-2">
+        <a class="btn btn-success btn-top pull-right"
+           href="index.php?mode=notes&amp;add_note=<?php echo $note_section; ?>">
+            <span class="glyphicon glyphicon-plus"></span> <?php echo $lang['add_note']; ?></a>
+    </div>
 </div>
 
-<?php if(isset($notes)): ?>
+<?php if (isset($notes)): ?>
 
-<div class="table-responsive">
-<table class="table table-striped table-hover">
- <tbody data-sortable="<?php echo BASE_URL; ?>cms/?mode=notes&amp;reorder_notes=true">
-  <?php $i=0; foreach($notes as $note): ?>
-  <tr id="item_<?php echo $note['id']; ?>">
-   <td class="<?php if($i%2==0): ?>a<?php else: ?>b<?php endif; ?>" style="cursor:move;">
-    <h3><?php echo stripslashes($note['title']); ?></h3>
-    <p><?php echo $note['text']; ?>
-    <?php if($note['link']!=''): ?><br />
-    <a href="<?php echo $note['link']; ?>"><?php echo $note['linkname']; ?></a><?php endif; ?></p>
-   </td>
-   <td class="options nowrap"><a class="btn btn-primary btn-xs" href="index.php?mode=notes&amp;edit_note=<?php echo $note['id']; ?>" title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
-   <a class="btn btn-danger btn-xs" href="index.php?mode=notes&amp;delete_note=<?php echo $note['id']; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_note_confirm']); ?>"><span class="glyphicon glyphicon-remove"></span></a>
-   <span class="btn btn-success btn-xs sortable-handle" title="<?php echo $lang['drag_and_drop']; ?>"><span class="glyphicon glyphicon-sort"></span></span><!--<a href="index.php?mode=notes&amp;move_up=<?php echo $note['id']; ?>"><img src="<?php echo BASE_URL; ?>templates/admin/images/arrow_up.png" alt="<?php echo $lang['move_up']; ?>" title="<?php echo $lang['move_up']; ?>" width="16" height="16" /></a><a href="index.php?mode=notes&amp;move_down=<?php echo $note['id']; ?>"><img src="<?php echo BASE_URL; ?>templates/admin/images/arrow_down.png" alt="<?php echo $lang['move_up']; ?>" title="<?php echo $lang['move_up']; ?>" width="16" height="16" /></a>--></td>
-  </tr>
- <?php $i++; endforeach; ?>
- </tbody>
-</table>
-</div>
+    <div class="table-responsive">
+        <table class="table table-striped table-hover">
+            <tbody data-sortable="<?php echo BASE_URL; ?>cms/?mode=notes&amp;reorder_notes=true">
+            <?php $i = 0;
+            foreach ($notes as $note): ?>
+                <tr id="item_<?php echo $note['id']; ?>">
+                    <td class="<?php if ($i % 2 == 0): ?>a<?php else: ?>b<?php endif; ?>" style="cursor:move;">
+                        <h3><?php echo stripslashes($note['title']); ?></h3>
+
+                        <p><?php echo $note['text']; ?>
+                            <?php if ($note['link'] != ''): ?><br/>
+                                <a
+                                href="<?php echo $note['link']; ?>"><?php echo $note['linkname']; ?></a><?php endif; ?>
+                        </p>
+                    </td>
+                    <td class="options nowrap">
+                        <a class="btn btn-primary btn-xs"
+                           href="index.php?mode=notes&amp;edit_note=<?php echo $note['id']; ?>"
+                           title="<?php echo $lang['edit']; ?>">
+                            <span class="glyphicon glyphicon-pencil"></span></a>
+                        <a class="btn btn-danger btn-xs"
+                           href="index.php?mode=notes&amp;delete_note=<?php echo $note['id']; ?>"
+                           title="<?php echo $lang['delete']; ?>"
+                           data-delete-confirm="<?php echo rawurlencode($lang['delete_note_confirm']); ?>">
+                            <span class="glyphicon glyphicon-remove"></span></a>
+                        <span class="btn btn-success btn-xs sortable-handle"
+                              title="<?php echo $lang['drag_and_drop']; ?>"><span
+                                class="glyphicon glyphicon-sort"></span></span><!--<a href="index.php?mode=notes&amp;move_up=<?php echo $note['id']; ?>"><img src="<?php echo BASE_URL; ?>templates/admin/images/arrow_up.png" alt="<?php echo $lang['move_up']; ?>" title="<?php echo $lang['move_up']; ?>" width="16" height="16" /></a><a href="index.php?mode=notes&amp;move_down=<?php echo $note['id']; ?>"><img src="<?php echo BASE_URL; ?>templates/admin/images/arrow_down.png" alt="<?php echo $lang['move_up']; ?>" title="<?php echo $lang['move_up']; ?>" width="16" height="16" /></a>-->
+                    </td>
+                </tr>
+                <?php $i++; endforeach; ?>
+            </tbody>
+        </table>
+    </div>
 
 <?php else: ?>
 
-<div class="alert alert-warning"><?php echo $lang['no_notes']; ?></div>
+    <div class="alert alert-warning"><?php echo $lang['no_notes']; ?></div>
 
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/notes_new_section.inc.tpl b/cms/templates/admin/subtemplates/notes_new_section.inc.tpl
index 28e56f1..0004d63 100644
--- a/cms/templates/admin/subtemplates/notes_new_section.inc.tpl
+++ b/cms/templates/admin/subtemplates/notes_new_section.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=notes"><?php echo $lang['notes']; ?></a></li>
-<li class="active"><?php echo $lang['create_note_section']; ?></li>
+    <li><a href="index.php?mode=notes"><?php echo $lang['notes']; ?></a></li>
+    <li class="active"><?php echo $lang['create_note_section']; ?></li>
 </ol>
 
 <h1><?php echo $lang['create_note_section']; ?></h1>
@@ -8,15 +8,17 @@
 <?php include('errors.inc.tpl'); ?>
 
 <form action="index.php" method="post">
-<div>
-<input type="hidden" name="mode" value="notes" />
+    <div>
+        <input type="hidden" name="mode" value="notes"/>
 
-<label for="new_note_section"><?php echo $lang['note_section_name_m']; ?></label>
-<div class="input-group form-control-default">
-<input class="form-control" id="new_note_section" type="text" name="new_note_section" value="<?php if(isset($new_note_section)) echo stripslashes($new_note_section); ?>" size="25" />
-<span class="input-group-btn">
-<button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
-</span>
-</div>
+        <label for="new_note_section"><?php echo $lang['note_section_name_m']; ?></label>
+
+        <div class="input-group form-control-default">
+            <input class="form-control" id="new_note_section" type="text" name="new_note_section"
+                   value="<?php if (isset($new_note_section)) echo stripslashes($new_note_section); ?>" size="25"/>
+            <span class="input-group-btn">
+            <button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
+            </span>
+        </div>
 </form>
 
diff --git a/cms/templates/admin/subtemplates/pages.inc.tpl b/cms/templates/admin/subtemplates/pages.inc.tpl
index 7ac4f59..dea2d90 100644
--- a/cms/templates/admin/subtemplates/pages.inc.tpl
+++ b/cms/templates/admin/subtemplates/pages.inc.tpl
@@ -1,55 +1,105 @@
 <div class="row">
-<div class="col-md-10">
-<h1><h1><?php echo $lang['page_overview']; ?></h1></h1>
-</div>
-<div class="col-md-2">
-<?php if($user_type==1): ?>
-<a href="<?php echo BASE_URL; ?>cms/index.php?mode=edit" class="btn btn-success btn-top pull-right"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['admin_menu_new_page']; ?></a><?php endif; ?>
-</div>
+    <div class="col-md-10">
+        <h1><h1><?php echo $lang['page_overview']; ?></h1></h1>
+    </div>
+    <div class="col-md-2">
+        <?php if ($user_type == 1): ?>
+        <a href="<?php echo BASE_URL; ?>cms/index.php?mode=edit" class="btn btn-success btn-top pull-right">
+            <span class="glyphicon glyphicon-plus"></span> <?php echo $lang['admin_menu_new_page']; ?>
+            </a><?php endif; ?>
+    </div>
 </div>
 
-<?php if(isset($pages)): ?>
-<div class="table-responsive">
-<table class="table table-striped table-hover">
- <thead>
- <tr>
-  <th><a href="index.php?mode=pages&amp;order=page&amp;descasc=<?php if($descasc=="ASC" && $order=="page"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['page_name_marking']; ?><?php if ($order=="page" && $descasc=="ASC"): ?> <span class="glyphicon glyphicon-chevron-down"></span><?php elseif($order=="page" && $descasc=="DESC"): ?> <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
-  <th><a href="index.php?mode=pages&amp;order=title&amp;descasc=<?php if($descasc=="ASC" && $order=="title"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['title_marking']; ?><?php if ($order=="title" && $descasc=="ASC"): ?> <span class="glyphicon glyphicon-chevron-down"></span><?php elseif($order=="title" && $descasc=="DESC"): ?> <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
-  <th><a href="index.php?mode=pages&amp;order=time&amp;descasc=<?php if($descasc=="ASC" && $order=="time"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['created_marking']; ?><?php if ($order=="time" && $descasc=="ASC"): ?> <span class="glyphicon glyphicon-chevron-down"></span><?php elseif($order=="time" && $descasc=="DESC"): ?> <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
-  <th><a href="index.php?mode=pages&amp;order=last_modified&amp;descasc=<?php if($descasc=="ASC" && $order=="last_modified"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['last_modified_marking']; ?><?php if ($order=="last_modified" && $descasc=="ASC"): ?> <span class="glyphicon glyphicon-chevron-down"></span><?php elseif($order=="last_modified" && $descasc=="DESC"): ?> <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
-  <?php if($settings['count_views']): ?>
-  <th><a href="index.php?mode=pages&amp;order=views&amp;descasc=<?php if($descasc=="ASC" && $order=="views"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['views_marking']; ?><?php if ($order=="views" && $descasc=="ASC"): ?> <span class="glyphicon glyphicon-chevron-down"></span><?php elseif($order=="views" && $descasc=="DESC"): ?> <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
-  <?php endif; ?>
-  <th>&nbsp;</th>
- </tr>
- </thead>
- <tbody>
- <?php $i=0; $total_views=0; foreach($pages as $page): ?>
- <tr>
-  <td><?php if($page['status']>0) { ?><a href="<?php echo BASE_URL.$page['page']; ?>"><?php if($settings['index_page']==$page['page']) { ?><b><?php } echo $page['page']; if($settings['index_page']==$page['page']) { ?></b><?php } ?></a><?php } else echo $page['page']; ?></td>
-  <td><?php echo $page['title']; ?></td>
-  <td class="nowrap"><?php echo strftime($lang['time_format'],$page['time']); if(isset($users[$page['author']])) { ?> <span class="smallx">(<?php echo $users[$page['author']]; ?>)</span><?php } ?></td>
-  <td class="nowrap"><?php echo strftime($lang['time_format'],$page['last_modified']); if(isset($users[$page['last_modified_by']])) { ?> <span class="smallx">(<?php echo $users[$page['last_modified_by']]; ?>)</span><?php } ?></td>
-  <?php if($settings['count_views']): ?>
-  <td><?php echo $page['views']; $total_views=$total_views+$page['views']; ?></td>
-  <?php endif; ?>
-  <?php if($page['edit_permission']): ?>
-  <td class="options nowrap"><a href="index.php?mode=edit&amp;id=<?php echo $page['id']; ?>" title="<?php echo $lang['edit']; ?>" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>&nbsp; <a href="index.php?mode=pages&amp;delete_page=<?php echo $page['id']; ?>" title="<?php echo $lang['delete']; ?>" class="btn btn-danger btn-xs" onclick="str='<?php echo rawurlencode($lang['delete_page_confirm']); ?>'; return confirm_link(str.replace('<?php echo rawurlencode('[page]'); ?>','<?php echo rawurlencode($page['page']); ?>'),this)"><span class="glyphicon glyphicon-remove"></span></a></td>
-  <?php else: ?>
-  <td>&nbsp;</td>
-  <?php endif; ?>
- </tr>
- <?php $i++; endforeach; ?>
- <?php if($settings['count_views']): ?>
- <tr>
-  <td colspan="4" style="text-align:right;"><?php echo str_replace('[time]',strftime($lang['time_format'],$settings['counter_last_resetted']),$lang['total_views']); ?></td>
-  <td><b><?php echo $total_views; ?></b></td>
-  <td colspan="2"><?php if($_SESSION[$settings['session_prefix'].'user_type']==1) { ?><span class="small"><a href="<?php echo basename($_SERVER['PHP_SELF']); ?>?mode=pages&amp;reset_views=true"><?php echo $lang['reset_views']; ?></a></span><?php } else { ?>&nbsp;<?php } ?></td>
- </tr>
- <?php endif; ?>
-</tbody>
-</table>
-</div>
+<?php if (isset($pages)): ?>
+    <div class="table-responsive">
+        <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+                <th>
+                    <a href="index.php?mode=pages&amp;order=page&amp;descasc=<?php if ($descasc == "ASC" && $order == "page"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['page_name_marking']; ?><?php if ($order == "page" && $descasc == "ASC"): ?>
+                            <span
+                                class="glyphicon glyphicon-chevron-down"></span><?php elseif ($order == "page" && $descasc == "DESC"): ?>
+                            <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
+                <th>
+                    <a href="index.php?mode=pages&amp;order=title&amp;descasc=<?php if ($descasc == "ASC" && $order == "title"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['title_marking']; ?><?php if ($order == "title" && $descasc == "ASC"): ?>
+                            <span
+                                class="glyphicon glyphicon-chevron-down"></span><?php elseif ($order == "title" && $descasc == "DESC"): ?>
+                            <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
+                <th>
+                    <a href="index.php?mode=pages&amp;order=time&amp;descasc=<?php if ($descasc == "ASC" && $order == "time"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['created_marking']; ?><?php if ($order == "time" && $descasc == "ASC"): ?>
+                            <span
+                                class="glyphicon glyphicon-chevron-down"></span><?php elseif ($order == "time" && $descasc == "DESC"): ?>
+                            <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
+                <th>
+                    <a href="index.php?mode=pages&amp;order=last_modified&amp;descasc=<?php if ($descasc == "ASC" && $order == "last_modified"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['last_modified_marking']; ?><?php if ($order == "last_modified" && $descasc == "ASC"): ?>
+                            <span
+                                class="glyphicon glyphicon-chevron-down"></span><?php elseif ($order == "last_modified" && $descasc == "DESC"): ?>
+                            <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
+                <?php if ($settings['count_views']): ?>
+                    <th>
+                        <a href="index.php?mode=pages&amp;order=views&amp;descasc=<?php if ($descasc == "ASC" && $order == "views"): ?>DESC<?php else: ?>ASC<?php endif; ?>"><?php echo $lang['views_marking']; ?><?php if ($order == "views" && $descasc == "ASC"): ?>
+                                <span
+                                    class="glyphicon glyphicon-chevron-down"></span><?php elseif ($order == "views" && $descasc == "DESC"): ?>
+                                <span class="glyphicon glyphicon-chevron-up"></span><?php endif; ?></a></th>
+                <?php endif; ?>
+                <th>&nbsp;</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php $i = 0;
+            $total_views = 0;
+            foreach ($pages as $page): ?>
+                <tr>
+                    <td><?php if ($page['status'] > 0) { ?>
+                            <a
+                            href="<?php echo BASE_URL . $page['page']; ?>"><?php if ($settings['index_page'] == $page['page']) { ?>
+                            <b><?php
+                        }
+                            echo $page['page'];
+                        if ($settings['index_page'] == $page['page']) {
+                            ?></b><?php } ?>
+                            </a><?php } else echo $page['page']; ?></td>
+                    <td><?php echo $page['title']; ?></td>
+                    <td class="nowrap"><?php echo strftime($lang['time_format'], $page['time']);
+                        if (isset($users[$page['author']])) {
+                            ?> <span class="smallx">
+                            (<?php echo $users[$page['author']]; ?>)</span><?php } ?></td>
+                    <td class="nowrap"><?php echo strftime($lang['time_format'], $page['last_modified']);
+                        if (isset($users[$page['last_modified_by']])) {
+                            ?> <span class="smallx">
+                            (<?php echo $users[$page['last_modified_by']]; ?>)</span><?php } ?></td>
+                    <?php if ($settings['count_views']): ?>
+                        <td><?php echo $page['views'];
+                            $total_views = $total_views + $page['views']; ?></td>
+                    <?php endif; ?>
+                    <?php if ($page['edit_permission']): ?>
+                        <td class="options nowrap"><a href="index.php?mode=edit&amp;id=<?php echo $page['id']; ?>"
+                                                      title="<?php echo $lang['edit']; ?>"
+                                                      class="btn btn-primary btn-xs">
+                                <span class="glyphicon glyphicon-pencil"></span></a>&nbsp;
+                            <a href="index.php?mode=pages&amp;delete_page=<?php echo $page['id']; ?>"
+                               title="<?php echo $lang['delete']; ?>" class="btn btn-danger btn-xs"
+                               onclick="str='<?php echo rawurlencode($lang['delete_page_confirm']); ?>'; return confirm_link(str.replace('<?php echo rawurlencode('[page]'); ?>','<?php echo rawurlencode($page['page']); ?>'),this)"><span
+                                    class="glyphicon glyphicon-remove"></span></a></td>
+                    <?php else: ?>
+                        <td>&nbsp;</td>
+                    <?php endif; ?>
+                </tr>
+                <?php $i++; endforeach; ?>
+            <?php if ($settings['count_views']): ?>
+                <tr>
+                    <td colspan="4"
+                        style="text-align:right;"><?php echo str_replace('[time]', strftime($lang['time_format'], $settings['counter_last_resetted']), $lang['total_views']); ?></td>
+                    <td><b><?php echo $total_views; ?></b></td>
+                    <td colspan="2"><?php if ($_SESSION[$settings['session_prefix'] . 'user_type'] == 1) { ?><span
+                            class="small">
+                            <a href="<?php echo basename($_SERVER['PHP_SELF']); ?>?mode=pages&amp;reset_views=true"><?php echo $lang['reset_views']; ?></a>
+                            </span><?php } else { ?>&nbsp;<?php } ?></td>
+                </tr>
+            <?php endif; ?>
+            </tbody>
+        </table>
+    </div>
 <?php else: ?>
-<div class="alert alert-info"><?php echo $lang['no_pages']; ?></div>
+    <div class="alert alert-info"><?php echo $lang['no_pages']; ?></div>
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/settings.inc.tpl b/cms/templates/admin/subtemplates/settings.inc.tpl
index 227b651..7e60378 100644
--- a/cms/templates/admin/subtemplates/settings.inc.tpl
+++ b/cms/templates/admin/subtemplates/settings.inc.tpl
@@ -1,112 +1,134 @@
 <h1><?php echo $lang['settings']; ?></h1>
 
-<?php if(isset($saved)): ?>
-<div class="alert alert-success">
-<button type="button" class="close" data-dismiss="alert">&times;</button>
-<span class="glyphicon glyphicon-ok"></span> <?php echo $lang['settings_saved']; ?><?php if(isset($cache_cleared)): ?> / <?php echo $lang['cache_cleared']; ?><?php endif;?>
-</div>
-<?php endif;?>
-
-<form action="<?php echo BASE_URL; ?>cms/index.php" method="post" class="form-horizontal">
-<input type="hidden" name="mode" value="settings" />
-<input type="hidden" name="settings_submitted" />
-
-<div class="form-group">
-<label for="website_title" class="col-md-2 control-label"><?php echo $lang['settings_website_title']; ?></label>
-<div class="col-md-6">
-<input type="text" class="form-control" id="website_title" name="website_title" value="<?php echo htmlspecialchars($settings['website_title']); ?>" size="35">
-</div>
-</div>
-
-<div class="form-group">
-<label for="website_subtitle" class="col-md-2 control-label"><?php echo $lang['settings_website_subtitle']; ?></label>
-<div class="col-md-6">
-<input type="text" class="form-control" id="website_subtitle" name="website_subtitle" value="<?php echo htmlspecialchars($settings['website_subtitle']); ?>" size="35">
-</div>
-</div>
-
-<div class="form-group">
-<label for="author" class="col-md-2 control-label"><?php echo $lang['settings_author']; ?></label>
-<div class="col-md-6">
-<input type="text" class="form-control" id="author" name="author" value="<?php echo htmlspecialchars($settings['author']); ?>" size="35">
-</div>
-</div>
-
-<div class="form-group">
-<label for="email" class="col-md-2 control-label"><?php echo $lang['settings_email']; ?></label>
-<div class="col-md-6">
-<input type="text" class="form-control" id="email" name="email" value="<?php echo htmlspecialchars($settings['email']); ?>" size="35">
-</div>
-</div>
-
-<div class="form-group">
-<label for="index_page" class="col-md-2 control-label"><?php echo $lang['settings_index_page']; ?></label>
-<div class="col-md-6">
-<select id="index_page" name="index_page" size="1" class="form-control">
-<?php foreach($pages as $current_page): ?>
-<option value="<?php echo $current_page['page']; ?>"<?php if($settings['index_page']==$current_page['page']): ?> selected="selected"<?php endif; ?>><?php echo $current_page['page']; ?></option>
-<?php endforeach; ?>
-</select>
-</div>
-</div>
-
-<div class="form-group">
-<label for="error_page" class="col-md-2 control-label"><?php echo $lang['settings_error_page']; ?></label>
-<div class="col-md-6">
-<select id="error_page" name="error_page" size="1" class="form-control">
-<?php foreach($pages as $current_page): ?>
-<option value="<?php echo $current_page['page']; ?>"<?php if($settings['error_page']==$current_page['page']): ?> selected="selected"<?php endif; ?>><?php echo $current_page['page']; ?></option>
-<?php endforeach; ?>
-</select></div>
-</div>
-
-<div class="form-group">
-<label for="admin_language" class="col-md-2 control-label"><?php echo $lang['admin_language']; ?></label>
-<div class="col-md-6">
-<select id="admin_language" name="admin_language" size="1" class="form-control">
-<?php foreach($admin_languages as $admin_language): ?>
-<option value="<?php echo $admin_language['identifier']; ?>"<?php if($settings['admin_language']==$admin_language['identifier']): ?> selected<?php endif ?>><?php echo $admin_language['name']; ?></option>
-<?php endforeach; ?>
-</select>
-</div>
-</div>
-
-<div class="form-group">
-<label for="default_page_language" class="col-md-2 control-label"><?php echo $lang['default_page_language']; ?></label>
-<div class="col-md-6">
-<select id="default_page_language" name="default_page_language" size="1" class="form-control">
-<?php foreach($page_languages as $page_language): ?>
-<option value="<?php echo $page_language['identifier']; ?>"<?php if($settings['default_page_language']==$page_language['identifier']): ?> selected<?php endif ?>><?php echo $page_language['name']; ?></option>
-<?php endforeach; ?>
-</select>
-</div>
-</div>
-
-<div class="form-group">
-<div class="col-md-offset-2 col-md-6">
-
-<div class="checkbox">
-<label for="caching">
-<input id="caching" type="checkbox" name="caching" value="1"<?php if($settings['caching']==1): ?> checked<?php endif; ?>> <?php echo $lang['settings_caching_enabled']; ?>
-</label>
-</div>
-
-<?php if($settings['caching'] && empty($settings['admin_auto_clear_cache'])): ?>
-<div class="checkbox">
-<label for="clear_cache">
-<input id="clear_cache" type="checkbox" name="clear_cache" value="1"> <?php echo $lang['admin_menu_clear_cache']; ?>
-</label>
-</div>
+<?php if (isset($saved)): ?>
+    <div class="alert alert-success">
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+        <span
+            class="glyphicon glyphicon-ok"></span> <?php echo $lang['settings_saved']; ?><?php if (isset($cache_cleared)): ?> / <?php echo $lang['cache_cleared']; ?><?php endif; ?>
+    </div>
 <?php endif; ?>
 
-</div>
-</div>
-
-<div class="form-group">
-<div class="col-md-offset-2 col-md-6">
-<button type="submit" class="btn btn-primary btn-strong"><?php echo $lang['submit_button_ok']; ?></button>
-<a class="btn btn-default" href="index.php?mode=settings&amp;action=advanced_settings"><?php echo $lang['advanced_settings']; ?></a>
-</div>
-</div>
+<form action="<?php echo BASE_URL; ?>cms/index.php" method="post" class="form-horizontal">
+    <input type="hidden" name="mode" value="settings"/>
+    <input type="hidden" name="settings_submitted"/>
+
+    <div class="form-group">
+        <label for="website_title" class="col-md-2 control-label"><?php echo $lang['settings_website_title']; ?></label>
+
+        <div class="col-md-6">
+            <input type="text" class="form-control" id="website_title" name="website_title"
+                   value="<?php echo htmlspecialchars($settings['website_title']); ?>" size="35">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="website_subtitle"
+               class="col-md-2 control-label"><?php echo $lang['settings_website_subtitle']; ?></label>
+
+        <div class="col-md-6">
+            <input type="text" class="form-control" id="website_subtitle" name="website_subtitle"
+                   value="<?php echo htmlspecialchars($settings['website_subtitle']); ?>" size="35">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="author" class="col-md-2 control-label"><?php echo $lang['settings_author']; ?></label>
+
+        <div class="col-md-6">
+            <input type="text" class="form-control" id="author" name="author"
+                   value="<?php echo htmlspecialchars($settings['author']); ?>" size="35">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="email" class="col-md-2 control-label"><?php echo $lang['settings_email']; ?></label>
+
+        <div class="col-md-6">
+            <input type="text" class="form-control" id="email" name="email"
+                   value="<?php echo htmlspecialchars($settings['email']); ?>" size="35">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="index_page" class="col-md-2 control-label"><?php echo $lang['settings_index_page']; ?></label>
+
+        <div class="col-md-6">
+            <select id="index_page" name="index_page" size="1" class="form-control">
+                <?php foreach ($pages as $current_page): ?>
+                    <option
+                        value="<?php echo $current_page['page']; ?>"<?php if ($settings['index_page'] == $current_page['page']): ?> selected="selected"<?php endif; ?>><?php echo $current_page['page']; ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="error_page" class="col-md-2 control-label"><?php echo $lang['settings_error_page']; ?></label>
+
+        <div class="col-md-6">
+            <select id="error_page" name="error_page" size="1" class="form-control">
+                <?php foreach ($pages as $current_page): ?>
+                    <option
+                        value="<?php echo $current_page['page']; ?>"<?php if ($settings['error_page'] == $current_page['page']): ?> selected="selected"<?php endif; ?>><?php echo $current_page['page']; ?></option>
+                <?php endforeach; ?>
+            </select></div>
+    </div>
+
+    <div class="form-group">
+        <label for="admin_language" class="col-md-2 control-label"><?php echo $lang['admin_language']; ?></label>
+
+        <div class="col-md-6">
+            <select id="admin_language" name="admin_language" size="1" class="form-control">
+                <?php foreach ($admin_languages as $admin_language): ?>
+                    <option
+                        value="<?php echo $admin_language['identifier']; ?>"<?php if ($settings['admin_language'] == $admin_language['identifier']): ?> selected<?php endif ?>><?php echo $admin_language['name']; ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="default_page_language"
+               class="col-md-2 control-label"><?php echo $lang['default_page_language']; ?></label>
+
+        <div class="col-md-6">
+            <select id="default_page_language" name="default_page_language" size="1" class="form-control">
+                <?php foreach ($page_languages as $page_language): ?>
+                    <option
+                        value="<?php echo $page_language['identifier']; ?>"<?php if ($settings['default_page_language'] == $page_language['identifier']): ?> selected<?php endif ?>><?php echo $page_language['name']; ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-6">
+
+            <div class="checkbox">
+                <label for="caching">
+                    <input id="caching" type="checkbox" name="caching"
+                           value="1"<?php if ($settings['caching'] == 1): ?> checked<?php endif; ?>> <?php echo $lang['settings_caching_enabled']; ?>
+                </label>
+            </div>
+
+            <?php if ($settings['caching'] && empty($settings['admin_auto_clear_cache'])): ?>
+                <div class="checkbox">
+                    <label for="clear_cache">
+                        <input id="clear_cache" type="checkbox" name="clear_cache"
+                               value="1"> <?php echo $lang['admin_menu_clear_cache']; ?>
+                    </label>
+                </div>
+            <?php endif; ?>
+
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-6">
+            <button type="submit" class="btn btn-primary btn-strong"><?php echo $lang['submit_button_ok']; ?></button>
+            <a class="btn btn-default"
+               href="index.php?mode=settings&amp;action=advanced_settings"><?php echo $lang['advanced_settings']; ?></a>
+        </div>
+    </div>
 
 </form>
diff --git a/cms/templates/admin/subtemplates/settings_advanced.inc.tpl b/cms/templates/admin/subtemplates/settings_advanced.inc.tpl
index 07f360c..a4d5aa0 100644
--- a/cms/templates/admin/subtemplates/settings_advanced.inc.tpl
+++ b/cms/templates/admin/subtemplates/settings_advanced.inc.tpl
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-<li><a href="index.php?mode=settings"><?php echo $lang['settings']; ?></a></li>
-<li class="active"><?php echo $lang['advanced_settings']; ?></li>
+    <li><a href="index.php?mode=settings"><?php echo $lang['settings']; ?></a></li>
+    <li class="active"><?php echo $lang['advanced_settings']; ?></li>
 </ol>
 
 <h1><?php echo $lang['advanced_settings']; ?></h1>
@@ -8,51 +8,58 @@
 <?php include('errors.inc.tpl'); ?>
 
 <form class="form-horizontal" action="index.php" method="post">
-<div>
-<input type="hidden" name="mode" value="settings" />
-<input type="hidden" name="settings_submitted" value="true" />
-<?php while(list($key, $val) = each($settings_sorted)): ?>
-
-<div class="form-group">
-<label for="<?php echo $key; ?>" class="col-md-2 control-label"><?php echo $key; ?></label>
-<div class="col-md-5">
-<input type="text" class="form-control" id="<?php echo $key; ?>" name="<?php echo $key; ?>" value="<?php echo $val; ?>">
-</div>
+    <div>
+        <input type="hidden" name="mode" value="settings"/>
+        <input type="hidden" name="settings_submitted" value="true"/>
+        <?php while (list($key, $val) = each($settings_sorted)): ?>
 
-<div class="col-md-1">
-<a class="btn btn-danger btn-xs" href="index.php?mode=settings&amp;delete=<?php echo $key; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_setting_confirm']); ?>"><span class="glyphicon glyphicon-remove"></span></a>
-</div>
+            <div class="form-group">
+                <label for="<?php echo $key; ?>" class="col-md-2 control-label"><?php echo $key; ?></label>
 
-</div>
+                <div class="col-md-5">
+                    <input type="text" class="form-control" id="<?php echo $key; ?>" name="<?php echo $key; ?>"
+                           value="<?php echo $val; ?>">
+                </div>
 
-<?php endwhile; ?>
+                <div class="col-md-1">
+                    <a class="btn btn-danger btn-xs" href="index.php?mode=settings&amp;delete=<?php echo $key; ?>"
+                       title="<?php echo $lang['delete']; ?>"
+                       data-delete-confirm="<?php echo rawurlencode($lang['delete_setting_confirm']); ?>"><span
+                            class="glyphicon glyphicon-remove"></span></a>
+                </div>
 
-<div class="form-group">
-<div class="col-lg-offset-2 col-lg-5">
-<button type="submit" class="btn btn-primary"><?php echo $lang['submit_button_ok']; ?></button>
-</div>
-</div>
+            </div>
 
-</div>
+        <?php endwhile; ?>
+
+        <div class="form-group">
+            <div class="col-lg-offset-2 col-lg-5">
+                <button type="submit" class="btn btn-primary"><?php echo $lang['submit_button_ok']; ?></button>
+            </div>
+        </div>
+
+    </div>
 </form>
 
 <div class="panel panel-default">
-<div class="panel-heading">
-<h3 class="panel-title"><?php echo $lang['add_new_setting_var']; ?></h3>
-</div>
-<div class="panel-body">
-<form class="form-inline" action="index.php" method="post">
-<div class="form-group">
-<input type="hidden" name="mode" value="settings">
-<input type="hidden" name="new_var_submitted" value="true">
-<label class="sr-only" for="name"><?php echo $lang['settings_name']; ?></label>
-<input type="text" class="form-control" id="name" name="name" placeholder="<?php echo $lang['settings_name']; ?>">
-</div>
-<div class="form-group">
-<label class="sr-only" for="value"><?php echo $lang['settings_value']; ?></label>
-<input type="text" class="form-control" id="value" name="value" placeholder="<?php echo $lang['settings_value']; ?>">
-</div>
-<button type="submit" class="btn btn-default"><?php echo $lang['submit_button_ok']; ?></button>
-</form>
-</div>
+    <div class="panel-heading">
+        <h3 class="panel-title"><?php echo $lang['add_new_setting_var']; ?></h3>
+    </div>
+    <div class="panel-body">
+        <form class="form-inline" action="index.php" method="post">
+            <div class="form-group">
+                <input type="hidden" name="mode" value="settings">
+                <input type="hidden" name="new_var_submitted" value="true">
+                <label class="sr-only" for="name"><?php echo $lang['settings_name']; ?></label>
+                <input type="text" class="form-control" id="name" name="name"
+                       placeholder="<?php echo $lang['settings_name']; ?>">
+            </div>
+            <div class="form-group">
+                <label class="sr-only" for="value"><?php echo $lang['settings_value']; ?></label>
+                <input type="text" class="form-control" id="value" name="value"
+                       placeholder="<?php echo $lang['settings_value']; ?>">
+            </div>
+            <button type="submit" class="btn btn-default"><?php echo $lang['submit_button_ok']; ?></button>
+        </form>
+    </div>
 </div>
diff --git a/cms/templates/admin/subtemplates/spam_protection.inc.tpl b/cms/templates/admin/subtemplates/spam_protection.inc.tpl
index 3a157ae..acc6bee 100644
--- a/cms/templates/admin/subtemplates/spam_protection.inc.tpl
+++ b/cms/templates/admin/subtemplates/spam_protection.inc.tpl
@@ -2,52 +2,58 @@
 
 <?php include('errors.inc.tpl'); ?>
 
-<?php if(isset($saved)): ?>
-<div class="alert alert-success">
-<button type="button" class="close" data-dismiss="alert">&times;</button>
-<span class="glyphicon glyphicon-ok"></span> <?php echo $lang['spam_protection_saved']; ?>
-</div>
+<?php if (isset($saved)): ?>
+    <div class="alert alert-success">
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+        <span class="glyphicon glyphicon-ok"></span> <?php echo $lang['spam_protection_saved']; ?>
+    </div>
 <?php endif; ?>
 
 <form action="index.php" method="post">
-<div>
-<input type="hidden" name="mode" value="spam_protection" />
-<input type="hidden" name="spam_protection_submit" value="true" />
-
-<div class="form-group">
-<label for="not_accepted_words"><?php echo $lang['not_accepted_words']; ?></label>
-<span class="help-block"><?php echo $lang['not_accepted_words_desc']; ?></span>
-<textarea id="not_accepted_words" class="form-control" name="not_accepted_words" rows="7"><?php if(isset($not_accepted_words)) echo stripslashes($not_accepted_words);  ?></textarea>
-</div>
-
-<div class="form-group">
-<label for="banned_ips"><?php echo $lang['banned_ips']; ?></label>
-<span class="help-block"><?php echo $lang['banned_ips_desc']; ?></span>
-<textarea id="banned_ips" class="form-control" name="banned_ips" rows="7"><?php if(isset($banned_ips)) echo stripslashes($banned_ips);  ?></textarea>
-</div>
-
-<div class="form-group">
-<label for="banned_user_agents"><?php echo $lang['banned_user_agents']; ?></label>
-<span class="help-block"><?php echo $lang['banned_user_agents_desc']; ?></span>
-<textarea id="banned_user_agents" class="form-control" name="banned_user_agents" rows="7"><?php if(isset($banned_user_agents)) echo stripslashes($banned_user_agents);  ?></textarea>
-</div>
-
-<div class="form-group">
-<label for="akismet_key"><?php echo $lang['akismet']; ?></label>
-<span class="help-block"><?php echo $lang['akismet_desc']; ?></span>
-<input id="akismet_key" class="form-control" type="text" name="akismet_key" value="<?php echo $akismet_key; ?>">
-</div>
-
-<div class="checkbox">
-<label>
-<input id="akismet_entry_check" type="checkbox" name="akismet_entry_check"<?php if(isset($akismet_entry_check) && $akismet_entry_check==1): ?> checked<?php endif; ?>> <?php echo $lang['akismet_entry_check']; ?>
-</label><br />
-<label>
-<input id="akismet_mail_check" type="checkbox" name="akismet_mail_check"<?php if(isset($akismet_mail_check) && $akismet_mail_check==1): ?> checked<?php endif; ?>> <?php echo $lang['akismet_mail_check']; ?>
-</label>
-</div>
-
-<button class="btn btn-primary" type="submit"><?php echo $lang['spam_protection_submit']; ?></button>
-
-</div>
+    <div>
+        <input type="hidden" name="mode" value="spam_protection"/>
+        <input type="hidden" name="spam_protection_submit" value="true"/>
+
+        <div class="form-group">
+            <label for="not_accepted_words"><?php echo $lang['not_accepted_words']; ?></label>
+            <span class="help-block"><?php echo $lang['not_accepted_words_desc']; ?></span>
+            <textarea id="not_accepted_words" class="form-control" name="not_accepted_words"
+                      rows="7"><?php if (isset($not_accepted_words)) echo stripslashes($not_accepted_words); ?></textarea>
+        </div>
+
+        <div class="form-group">
+            <label for="banned_ips"><?php echo $lang['banned_ips']; ?></label>
+            <span class="help-block"><?php echo $lang['banned_ips_desc']; ?></span>
+            <textarea id="banned_ips" class="form-control" name="banned_ips"
+                      rows="7"><?php if (isset($banned_ips)) echo stripslashes($banned_ips); ?></textarea>
+        </div>
+
+        <div class="form-group">
+            <label for="banned_user_agents"><?php echo $lang['banned_user_agents']; ?></label>
+            <span class="help-block"><?php echo $lang['banned_user_agents_desc']; ?></span>
+            <textarea id="banned_user_agents" class="form-control" name="banned_user_agents"
+                      rows="7"><?php if (isset($banned_user_agents)) echo stripslashes($banned_user_agents); ?></textarea>
+        </div>
+
+        <div class="form-group">
+            <label for="akismet_key"><?php echo $lang['akismet']; ?></label>
+            <span class="help-block"><?php echo $lang['akismet_desc']; ?></span>
+            <input id="akismet_key" class="form-control" type="text" name="akismet_key"
+                   value="<?php echo $akismet_key; ?>">
+        </div>
+
+        <div class="checkbox">
+            <label>
+                <input id="akismet_entry_check" type="checkbox"
+                       name="akismet_entry_check"<?php if (isset($akismet_entry_check) && $akismet_entry_check == 1): ?> checked<?php endif; ?>> <?php echo $lang['akismet_entry_check']; ?>
+            </label><br/>
+            <label>
+                <input id="akismet_mail_check" type="checkbox"
+                       name="akismet_mail_check"<?php if (isset($akismet_mail_check) && $akismet_mail_check == 1): ?> checked<?php endif; ?>> <?php echo $lang['akismet_mail_check']; ?>
+            </label>
+        </div>
+
+        <button class="btn btn-primary" type="submit"><?php echo $lang['spam_protection_submit']; ?></button>
+
+    </div>
 </form>
diff --git a/cms/templates/admin/subtemplates/users.inc.tpl b/cms/templates/admin/subtemplates/users.inc.tpl
index 1cbf56c..b969be3 100644
--- a/cms/templates/admin/subtemplates/users.inc.tpl
+++ b/cms/templates/admin/subtemplates/users.inc.tpl
@@ -1,44 +1,54 @@
 <div class="row">
-<div class="col-md-10">
-<h1><?php echo $lang['users']; ?></h1>
-</div>
-<div class="col-md-2">
-<?php if($user_type==1): ?>
-<a class="btn btn-success btn-top pull-right" href="index.php?mode=users&amp;action=new"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['create_user_account']; ?></a>
-<?php endif; ?>
-</div>
+    <div class="col-md-10">
+        <h1><?php echo $lang['users']; ?></h1>
+    </div>
+    <div class="col-md-2">
+        <?php if ($user_type == 1): ?>
+            <a class="btn btn-success btn-top pull-right" href="index.php?mode=users&amp;action=new"><span
+                    class="glyphicon glyphicon-plus"></span> <?php echo $lang['create_user_account']; ?></a>
+        <?php endif; ?>
+    </div>
 </div>
 
 <?php include('errors.inc.tpl'); ?>
 
-<?php if(isset($users)): ?>
+<?php if (isset($users)): ?>
 
-<div class="table-responsive">
-<table class="table table-striped table-hover">
-<thead>
- <tr>
-  <th><?php echo $lang['user_name']; ?></th>
-  <th><?php echo $lang['user_type']; ?></th>
-  <th><?php echo $lang['last_login']; ?></th>
-  <th>&nbsp;</th>
- </tr>
-</thead>
-<tbody>
- <?php $i=0; foreach($users as $user): ?>
- <tr>
-  <td><?php echo htmlspecialchars(stripslashes($user['name'])); ?></td>
-  <td><?php if($user['type']==0) echo $lang['type_0']; elseif($user['type']==1) echo $lang['type_1']?></td>
-  <td><?php if($user['last_login']) echo strftime($lang['time_format'],$user['last_login']); ?></td>
-  <td class="options"><?php if($user_type==1 || $user_id==$user['id']): ?><a class="btn btn-primary btn-xs" href="index.php?mode=users&amp;edit=<?php echo $user['id']; ?>" title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a><?php endif; ?>
-  <?php if($user_type==1): ?><a class="btn btn-danger btn-xs" href="index.php?mode=users&amp;delete=<?php echo $user['id']; ?>" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['delete_user_confirm']); ?>"><span class="glyphicon glyphicon-remove"></span></a><?php endif; ?></td>
- </tr>
- <?php $i++; endforeach; ?>
-</tbody>
-</table>
-</div>
+    <div class="table-responsive">
+        <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+                <th><?php echo $lang['user_name']; ?></th>
+                <th><?php echo $lang['user_type']; ?></th>
+                <th><?php echo $lang['last_login']; ?></th>
+                <th>&nbsp;</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php $i = 0;
+            foreach ($users as $user): ?>
+                <tr>
+                    <td><?php echo htmlspecialchars(stripslashes($user['name'])); ?></td>
+                    <td><?php if ($user['type'] == 0) echo $lang['type_0']; elseif ($user['type'] == 1) echo $lang['type_1'] ?></td>
+                    <td><?php if ($user['last_login']) echo strftime($lang['time_format'], $user['last_login']); ?></td>
+                    <td class="options"><?php if ($user_type == 1 || $user_id == $user['id']): ?><a
+                            class="btn btn-primary btn-xs"
+                            href="index.php?mode=users&amp;edit=<?php echo $user['id']; ?>"
+                            title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span>
+                            </a><?php endif; ?>
+                        <?php if ($user_type == 1): ?><a class="btn btn-danger btn-xs"
+                                                         href="index.php?mode=users&amp;delete=<?php echo $user['id']; ?>"
+                                                         title="<?php echo $lang['delete']; ?>"
+                                                         data-delete-confirm="<?php echo rawurlencode($lang['delete_user_confirm']); ?>">
+                                <span class="glyphicon glyphicon-remove"></span></a><?php endif; ?></td>
+                </tr>
+                <?php $i++; endforeach; ?>
+            </tbody>
+        </table>
+    </div>
 
 <?php else: ?>
 
-<p><?php echo $lang['no_users']; ?></p>
+    <p><?php echo $lang['no_users']; ?></p>
 
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/users_delete.inc.tpl b/cms/templates/admin/subtemplates/users_delete.inc.tpl
index 7daba8b..8258d44 100644
--- a/cms/templates/admin/subtemplates/users_delete.inc.tpl
+++ b/cms/templates/admin/subtemplates/users_delete.inc.tpl
@@ -1,20 +1,21 @@
-<h1><a href="index.php"><?php echo $lang['administration']; ?></a> &raquo; <a href="index.php?mode=users"><?php echo $lang['users']; ?></a> &raquo; <?php echo $lang['delete_user']; ?></h1>
+<h1><a href="index.php"><?php echo $lang['administration']; ?></a> &raquo; <a
+        href="index.php?mode=users"><?php echo $lang['users']; ?></a> &raquo; <?php echo $lang['delete_user']; ?></h1>
 
-<?php if(isset($userdata)): ?>
+<?php if (isset($userdata)): ?>
 
-<p><?php echo str_replace('[name]',$userdata['name'],$lang['delete_user_confirm']); ?></p>
+    <p><?php echo str_replace('[name]', $userdata['name'], $lang['delete_user_confirm']); ?></p>
+
+    <form action="<?php basename($_SERVER['PHP_SELF']); ?>" method="post">
+        <div>
+            <input type="hidden" name="mode" value="users"/>
+            <input type="hidden" name="delete" value="<?php echo $userdata['id']; ?>"/>
+            <input type="submit" name="confirmed" value="<?php echo $lang['delete_user_submit']; ?>"/>
+        </div>
+    </form>
 
-<form action="<?php basename($_SERVER['PHP_SELF']); ?>" method="post">
- <div>
-  <input type="hidden" name="mode" value="users" />
-  <input type="hidden" name="delete" value="<?php echo $userdata['id']; ?>" />
-  <input type="submit" name="confirmed" value="<?php echo $lang['delete_user_submit']; ?>" />
- </div>
-</form>
-     
 <?php else: ?>
 
-<p class="caution"><?php echo $lang['invalid_request']; ?></p>
+    <p class="caution"><?php echo $lang['invalid_request']; ?></p>
 
-<?php endif; ?>
+<?php endif; ?>
 
diff --git a/cms/templates/admin/subtemplates/users_edit.inc.tpl b/cms/templates/admin/subtemplates/users_edit.inc.tpl
index a531426..fa50ea7 100644
--- a/cms/templates/admin/subtemplates/users_edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/users_edit.inc.tpl
@@ -1,100 +1,117 @@
-<?php if($user_type==1): ?>
-<ol class="breadcrumb">
-<li><a href="#"><a href="index.php?mode=users"><?php echo $lang['users']; ?></a></a></li>
-<li class="active"><?php echo $lang['edit_userdata']; ?></li>
-</ol>
+<?php if ($user_type == 1): ?>
+    <ol class="breadcrumb">
+        <li><a href="#"><a href="index.php?mode=users"><?php echo $lang['users']; ?></a></a></li>
+        <li class="active"><?php echo $lang['edit_userdata']; ?></li>
+    </ol>
 <?php endif; ?>
 
 <h1><?php echo $lang['edit_userdata']; ?></h1>
 
-<?php if(isset($saved)): ?>
-<div class="alert alert-success">
-<button type="button" class="close" data-dismiss="alert">&times;</button>
-<span class="glyphicon glyphicon-ok"></span> <?php echo $lang['userdata_saved_message']; ?><?php if(isset($cache_cleared)): ?> / <?php echo $lang['cache_cleared']; ?><?php endif;?>
-</div>
+<?php if (isset($saved)): ?>
+    <div class="alert alert-success">
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+        <span
+            class="glyphicon glyphicon-ok"></span> <?php echo $lang['userdata_saved_message']; ?><?php if (isset($cache_cleared)): ?> / <?php echo $lang['cache_cleared']; ?><?php endif; ?>
+    </div>
 <?php endif; ?>
 
 <?php include('errors.inc.tpl'); ?>
-     
-<?php if(isset($userdata) || $user_type==0): ?>
-
-<form class="form-horizontal" action="index.php" method="post">
-<div>
-<input type="hidden" name="mode" value="users" />
-<input type="hidden" name="edit_user_submitted" value="true" />
-<?php if($user_type==1): ?>
-<input type="hidden" name="id" value="<?php echo $userdata['id']; ?>" />
-<?php endif; ?>
-
-<?php if($user_type==1): ?>
-
-<div class="form-group">
-<label for="name" class="col-lg-2 control-label"><?php echo $lang['edit_userdata_name']; ?></label>
-<div class="col-lg-6">
-<input id="name" class="form-control" type="text" name="name" value="<?php echo $userdata['name']; ?>">
-</div>
-</div>
-
-<div class="form-group">
-<label for="new_pw" class="col-lg-2 control-label"><?php echo $lang['change_pw_new']; ?></label>
-<div class="col-lg-6">
-<input id="new_pw" class="form-control" type="password" name="new_pw" autocomplete="off">
-<span class="help-block"><?php echo $lang['change_pw_note']; ?></span>
-</div>
-</div>
-
-<div class="form-group">
-<label for="new_pw_r" class="col-lg-2 control-label"><?php echo $lang['change_pw_new_conf']; ?></label>
-<div class="col-lg-6">
-<input id="new_pw_r" class="form-control" type="password" name="new_pw_r" autocomplete="off">
-<span class="help-block"><?php echo $lang['change_pw_note']; ?></span>
-</div>
-</div>
-
-<div class="form-group">
-<span class="col-lg-2 control-label"><strong><?php echo $lang['edit_userdata_type']; ?></strong></span>
-<div class="col-lg-6">
-<div class="radio">
-<input id="type_0" type="radio" name="type" value="0"<?php if($userdata['type']==0): ?> checked="checked"<?php endif; ?> /><label for="type_0"><?php echo $lang['type_0']; ?></label><br />
-<input id="type_1" type="radio" name="type" value="1"<?php if($userdata['type']==1): ?> checked="checked"<?php endif; ?> /><label for="type_1"><?php echo $lang['type_1']; ?></label>
-</div>
-</div>
-</div>
-
-<?php else: ?>
-
-<div class="form-group">
-<label for="old_pw" class="col-lg-2 control-label"><?php echo $lang['change_pw_old']; ?></label>
-<div class="col-lg-6">
-<input id="old_pw" class="form-control" type="password" name="old_pw" autocomplete="off" autofocus>
-</div>
-</div>
-
-<div class="form-group">
-<label for="new_pw" class="col-lg-2 control-label"><?php echo $lang['change_pw_new']; ?></label>
-<div class="col-lg-6">
-<input id="new_pw" class="form-control" type="password" name="new_pw" autocomplete="off">
-</div>
-</div>
-
-<div class="form-group">
-<label for="new_pw_r" class="col-lg-2 control-label"><?php echo $lang['change_pw_new_conf']; ?></label>
-<div class="col-lg-6">
-<input id="new_pw_r" class="form-control" type="password" name="new_pw_r" autocomplete="off">
-</div>
-</div>
-
-<?php endif; ?>
 
-<div class="form-group">
-<div class="col-md-offset-2 col-md-10">
-<button type="submit" class="btn btn-primary"><?php echo $lang['submit_button_ok']; ?></button>
-</div>
-</div>
+<?php if (isset($userdata) || $user_type == 0): ?>
+
+    <form class="form-horizontal" action="index.php" method="post">
+        <div>
+            <input type="hidden" name="mode" value="users"/>
+            <input type="hidden" name="edit_user_submitted" value="true"/>
+            <?php if ($user_type == 1): ?>
+                <input type="hidden" name="id" value="<?php echo $userdata['id']; ?>"/>
+            <?php endif; ?>
+
+            <?php if ($user_type == 1): ?>
+
+                <div class="form-group">
+                    <label for="name" class="col-lg-2 control-label"><?php echo $lang['edit_userdata_name']; ?></label>
+
+                    <div class="col-lg-6">
+                        <input id="name" class="form-control" type="text" name="name"
+                               value="<?php echo $userdata['name']; ?>">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label for="new_pw" class="col-lg-2 control-label"><?php echo $lang['change_pw_new']; ?></label>
+
+                    <div class="col-lg-6">
+                        <input id="new_pw" class="form-control" type="password" name="new_pw" autocomplete="off">
+                        <span class="help-block"><?php echo $lang['change_pw_note']; ?></span>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label for="new_pw_r"
+                           class="col-lg-2 control-label"><?php echo $lang['change_pw_new_conf']; ?></label>
+
+                    <div class="col-lg-6">
+                        <input id="new_pw_r" class="form-control" type="password" name="new_pw_r" autocomplete="off">
+                        <span class="help-block"><?php echo $lang['change_pw_note']; ?></span>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <span
+                        class="col-lg-2 control-label"><strong><?php echo $lang['edit_userdata_type']; ?></strong></span>
+
+                    <div class="col-lg-6">
+                        <div class="radio">
+                            <input id="type_0" type="radio" name="type"
+                                   value="0"<?php if ($userdata['type'] == 0): ?> checked="checked"<?php endif; ?> /><label
+                                for="type_0"><?php echo $lang['type_0']; ?></label><br/>
+                            <input id="type_1" type="radio" name="type"
+                                   value="1"<?php if ($userdata['type'] == 1): ?> checked="checked"<?php endif; ?> /><label
+                                for="type_1"><?php echo $lang['type_1']; ?></label>
+                        </div>
+                    </div>
+                </div>
+
+            <?php else: ?>
+
+                <div class="form-group">
+                    <label for="old_pw" class="col-lg-2 control-label"><?php echo $lang['change_pw_old']; ?></label>
+
+                    <div class="col-lg-6">
+                        <input id="old_pw" class="form-control" type="password" name="old_pw" autocomplete="off"
+                               autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label for="new_pw" class="col-lg-2 control-label"><?php echo $lang['change_pw_new']; ?></label>
+
+                    <div class="col-lg-6">
+                        <input id="new_pw" class="form-control" type="password" name="new_pw" autocomplete="off">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label for="new_pw_r"
+                           class="col-lg-2 control-label"><?php echo $lang['change_pw_new_conf']; ?></label>
+
+                    <div class="col-lg-6">
+                        <input id="new_pw_r" class="form-control" type="password" name="new_pw_r" autocomplete="off">
+                    </div>
+                </div>
+
+            <?php endif; ?>
+
+            <div class="form-group">
+                <div class="col-md-offset-2 col-md-10">
+                    <button type="submit" class="btn btn-primary"><?php echo $lang['submit_button_ok']; ?></button>
+                </div>
+            </div>
+
+        </div>
+    </form>
 
-</div>
-</form>
-     
 <?php else: ?>
-<p class="caution"><?php echo $lang['invalid_request']; ?></p>
+    <p class="caution"><?php echo $lang['invalid_request']; ?></p>
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/users_new.inc.tpl b/cms/templates/admin/subtemplates/users_new.inc.tpl
index bfdb7a9..7e6bb43 100644
--- a/cms/templates/admin/subtemplates/users_new.inc.tpl
+++ b/cms/templates/admin/subtemplates/users_new.inc.tpl
@@ -1,41 +1,44 @@
 <ol class="breadcrumb">
-<li><a href="#"><a href="index.php?mode=users"><?php echo $lang['users']; ?></a></a></li>
-<li class="active"><?php echo $lang['create_user_account']; ?></li>
+    <li><a href="#"><a href="index.php?mode=users"><?php echo $lang['users']; ?></a></a></li>
+    <li class="active"><?php echo $lang['create_user_account']; ?></li>
 </ol>
 
 <?php include('errors.inc.tpl'); ?>
 
-<form class="form-horizontal" action="index.php" method="post" />
+<form class="form-horizontal" action="index.php" method="post"/>
 <div>
-<input type="hidden" name="mode" value="users" />
-<input type="hidden" name="new_user_submitted" value="true" />
+    <input type="hidden" name="mode" value="users"/>
+    <input type="hidden" name="new_user_submitted" value="true"/>
 
-<div class="form-group">
-<label for="name" class="col-lg-2 control-label"><?php echo $lang['user_name_m']; ?></label>
-<div class="col-lg-6">
-<input id="name" class="form-control" type="text" name="name">
-</div>
-</div>
+    <div class="form-group">
+        <label for="name" class="col-lg-2 control-label"><?php echo $lang['user_name_m']; ?></label>
 
-<div class="form-group">
-<label for="pw" class="col-lg-2 control-label"><?php echo $lang['pw_m']; ?></label>
-<div class="col-lg-6">
-<input id="pw" class="form-control" type="password" name="pw" autocomplete="off">
-</div>
-</div>
+        <div class="col-lg-6">
+            <input id="name" class="form-control" type="text" name="name">
+        </div>
+    </div>
 
-<div class="form-group">
-<label for="pw_r" class="col-lg-2 control-label"><?php echo $lang['pw_conf_m']; ?></label>
-<div class="col-lg-6">
-<input id="pw_r" class="form-control" type="password" name="pw_r" autocomplete="off">
-</div>
-</div>
+    <div class="form-group">
+        <label for="pw" class="col-lg-2 control-label"><?php echo $lang['pw_m']; ?></label>
 
-<div class="form-group">
-<div class="col-md-offset-2 col-md-10">
-<button type="submit" class="btn btn-primary"><?php echo $lang['submit_button_ok']; ?></button>
-</div>
-</div>
+        <div class="col-lg-6">
+            <input id="pw" class="form-control" type="password" name="pw" autocomplete="off">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="pw_r" class="col-lg-2 control-label"><?php echo $lang['pw_conf_m']; ?></label>
+
+        <div class="col-lg-6">
+            <input id="pw_r" class="form-control" type="password" name="pw_r" autocomplete="off">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary"><?php echo $lang['submit_button_ok']; ?></button>
+        </div>
+    </div>
 
 </div>
 </form>
diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl
index 00131d1..75741bf 100644
--- a/cms/templates/default.tpl
+++ b/cms/templates/default.tpl
@@ -1,111 +1,120 @@
 <!DOCTYPE html>
 <html lang="<?php echo $lang['lang']; ?>" dir="<?php echo $lang['dir']; ?>">
 <head>
-<meta charset="<?php echo $lang['charset']; ?>" />
-<title><?php if($page_title): ?><?php echo $page_title; ?><?php else: ?><?php if($title): ?><?php echo $title; ?> - <?php endif; ?><?php echo $settings['website_title']; ?><?php endif; ?></title>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="<?php if($description) echo $description; else echo $settings['default_description']; ?>" />
-<meta name="keywords" content="<?php if($keywords) echo $keywords; else echo $settings['default_keywords']; ?>" />
-<meta name="generator" content="phpSQLiteCMS <?php echo $settings['version']; ?>" />
-<link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
-<link href='http://fonts.googleapis.com/css?family=Patua+One' rel='stylesheet' type='text/css'>
-<link href="<?php echo STATIC_URL; ?>css/style.css" rel="stylesheet">
-<?php if(isset($tv['map'])): ?>
-<link rel="stylesheet" href="<?php echo STATIC_URL; ?>css/leaflet.css" />
-<?php endif; ?>
-<link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png">
+    <meta charset="<?php echo $lang['charset']; ?>"/>
+    <title><?php if ($page_title): ?><?php echo $page_title; ?><?php else: ?><?php if ($title): ?><?php echo $title; ?> - <?php endif; ?><?php echo $settings['website_title']; ?><?php endif; ?></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description"
+          content="<?php if ($description) echo $description; else echo $settings['default_description']; ?>"/>
+    <meta name="keywords" content="<?php if ($keywords) echo $keywords; else echo $settings['default_keywords']; ?>"/>
+    <meta name="generator" content="phpSQLiteCMS <?php echo $settings['version']; ?>"/>
+    <link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
+    <link href='http://fonts.googleapis.com/css?family=Patua+One' rel='stylesheet' type='text/css'>
+    <link href="<?php echo STATIC_URL; ?>css/style.css" rel="stylesheet">
+    <?php if (isset($tv['map'])): ?>
+        <link rel="stylesheet" href="<?php echo STATIC_URL; ?>css/leaflet.css"/>
+    <?php endif; ?>
+    <link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png">
 </head>
 
-<body<?php if($admin): ?> class="admin"<?php endif; ?>>
-<?php if($admin) include(BASE_PATH.'cms/templates/admin/subtemplates/admin_menu.inc.tpl'); ?>
+<body<?php if ($admin): ?> class="admin"<?php endif; ?>>
+<?php if ($admin) include(BASE_PATH . 'cms/templates/admin/subtemplates/admin_menu.inc.tpl'); ?>
 
 <div class="container">
 
-<header class="header">
-<div class="row">
-<div class="col-md-4 logo-wrapper">
-<h1 id="logo"><a href="<?php echo BASE_URL; ?>"><?php echo $settings['website_title']; ?></a></h1>
-</div>
-<a id="menu-toggle-handle" href="#" class="visible-xs"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a>
-<nav id="nav" class="col-md-8">		
-<?php if($menu_1 && isset($menus[$menu_1])): ?>
-<ul class="nav nav-pills">
-<?php foreach($menus[$menu_1] as $item): ?><li<?php if(!empty($item['section']) && $item['section']==$section[0]): ?> class="active"<?php endif; ?>><a href="<?php echo $item['link']; ?>" title="<?php echo $item['title']; ?>"<?php if($item['accesskey']!=''): ?> accesskey="<?php echo $item['accesskey']; ?>"<?php endif; ?>><?php echo $item['name']; ?></a></li><?php endforeach; ?>
-</ul>
-<?php endif; ?>
-</nav>
-</div>
-</header>
-
-<?php if($sidebar_1): ?>
-<?php echo $sidebar_1; ?>
-<?php endif; ?>
-
-<?php if($breadcrumbs): ?>
-<ul class="breadcrumb">
-<?php foreach($breadcrumbs as $breadcrumb): ?>
-<li><a href="<?php echo BASE_URL.$breadcrumb['page']; ?>"><?php echo $breadcrumb['title']; ?></a></li>
-<?php endforeach; ?>
-<li class="active"><?php echo $title; ?></li>
-</ul>
-<?php endif; ?>
-
-<?php if(empty($sidebar_1) && empty($breadcrumbs)): ?>
-<hr class="topsep hidden-xs">
-<?php endif; ?>
-    
-<div class="body-content">
-
-<div class="row<?php if(isset($tv['nocolumns'])): ?> main-content<?php endif; ?>">
-
-<?php if(empty($tv['nocolumns'])): ?>
-<div class="col-md-9 main-content">
-<?php endif; ?>
-
-<?php if(empty($hide_content)) echo $content; ?>
-<?php if(isset($subtemplate)) include(BASE_PATH.'cms/templates/subtemplates/'.$subtemplate); ?>
-
-</div>
-
-<?php if($sidebar_2): ?>
-<div class="col-md-3 sidebar">
-<?php echo $sidebar_2; ?>
-</div>
-<?php endif; ?>
-
-<?php if(empty($tv['nocolumns'])): ?>
-</div>
-<?php endif; ?>
-
-</div>
-
-<?php if($sidebar_3): ?>
-<?php echo $sidebar_3; ?>
-<?php endif; ?>
-
-<hr class="closure">
-
-<footer class="row footer">
-<div class="col-lg-12">
-
-<?php if($gcb_1 && isset($gcb[$gcb_1])): ?>
-<?php echo $gcb[$gcb_1]; ?>
-<?php else: ?>
-<p>&copy; <?php echo date("Y"); ?> <?php echo $settings['author']; ?><?php if($type!='news' && $type!='search' && $type!='notes'): ?><br /><?php echo $lang['page_last_modified']; ?><?php endif; ?><br />Powered by <a href="http://phpsqlitecms.net">phpSQLiteCMS</a></p>
-<?php endif; ?>
-</div>
-</footer>
+    <header class="header">
+        <div class="row">
+            <div class="col-md-4 logo-wrapper">
+                <h1 id="logo"><a href="<?php echo BASE_URL; ?>"><?php echo $settings['website_title']; ?></a></h1>
+            </div>
+            <a id="menu-toggle-handle" href="#" class="visible-xs"><span class="icon-bar"></span>
+                <span class="icon-bar"></span><span class="icon-bar"></span></a>
+            <nav id="nav" class="col-md-8">
+                <?php if ($menu_1 && isset($menus[$menu_1])): ?>
+                    <ul class="nav nav-pills">
+                        <?php foreach ($menus[$menu_1] as $item): ?>
+                            <li<?php if (!empty($item['section']) && $item['section'] == $section[0]): ?> class="active"<?php endif; ?>>
+                            <a href="<?php echo $item['link']; ?>"
+                               title="<?php echo $item['title']; ?>"<?php if ($item['accesskey'] != ''): ?> accesskey="<?php echo $item['accesskey']; ?>"<?php endif; ?>><?php echo $item['name']; ?></a>
+                            </li><?php endforeach; ?>
+                    </ul>
+                <?php endif; ?>
+            </nav>
+        </div>
+    </header>
+
+    <?php if ($sidebar_1): ?>
+        <?php echo $sidebar_1; ?>
+    <?php endif; ?>
+
+    <?php if ($breadcrumbs): ?>
+        <ul class="breadcrumb">
+            <?php foreach ($breadcrumbs as $breadcrumb): ?>
+                <li><a href="<?php echo BASE_URL . $breadcrumb['page']; ?>"><?php echo $breadcrumb['title']; ?></a></li>
+            <?php endforeach; ?>
+            <li class="active"><?php echo $title; ?></li>
+        </ul>
+    <?php endif; ?>
+
+    <?php if (empty($sidebar_1) && empty($breadcrumbs)): ?>
+        <hr class="topsep hidden-xs">
+    <?php endif; ?>
+
+    <div class="body-content">
+
+        <div class="row<?php if (isset($tv['nocolumns'])): ?> main-content<?php endif; ?>">
+
+            <?php if (empty($tv['nocolumns'])): ?>
+            <div class="col-md-9 main-content">
+                <?php endif; ?>
+
+                <?php if (empty($hide_content)) echo $content; ?>
+                <?php if (isset($subtemplate)) include(BASE_PATH . 'cms/templates/subtemplates/' . $subtemplate); ?>
+
+            </div>
+
+            <?php if ($sidebar_2): ?>
+                <div class="col-md-3 sidebar">
+                    <?php echo $sidebar_2; ?>
+                </div>
+            <?php endif; ?>
+
+            <?php if (empty($tv['nocolumns'])): ?>
+        </div>
+        <?php endif; ?>
+
+    </div>
+
+    <?php if ($sidebar_3): ?>
+        <?php echo $sidebar_3; ?>
+    <?php endif; ?>
+
+    <hr class="closure">
+
+    <footer class="row footer">
+        <div class="col-lg-12">
+
+            <?php if ($gcb_1 && isset($gcb[$gcb_1])): ?>
+                <?php echo $gcb[$gcb_1]; ?>
+            <?php else: ?>
+                <p>&copy; <?php echo date("Y"); ?> <?php echo $settings['author']; ?><?php if ($type != 'news' && $type != 'search' && $type != 'notes'): ?>
+                        <br/><?php echo $lang['page_last_modified']; ?><?php endif; ?><br/>Powered by
+                    <a href="http://phpsqlitecms.net">phpSQLiteCMS</a></p>
+            <?php endif; ?>
+        </div>
+    </footer>
 
 </div>
 
 <script src="<?php echo JQUERY; ?>"></script>
 <script src="<?php echo BOOTSTRAP; ?>"></script>
 <script src="<?php echo STATIC_URL; ?>js/main.js"></script>
-<?php if($admin): ?>
-<script src="<?php echo STATIC_URL; ?>js/admin_frontend.js"></script>
+<?php if ($admin): ?>
+    <script src="<?php echo STATIC_URL; ?>js/admin_frontend.js"></script>
+<?php endif; ?>
+<?php if (isset($contains_thumbnails)): ?>
+    <script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>
 <?php endif; ?>
-<?php if(isset($contains_thumbnails)): ?>
-<script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>
-<?php endif; ?>    
 </body>
 </html>
+
diff --git a/cms/templates/rss.tpl b/cms/templates/rss.tpl
index 6069cc2..fe1b44a 100644
--- a/cms/templates/rss.tpl
+++ b/cms/templates/rss.tpl
@@ -1,17 +1,17 @@
-<?php echo '<?xml version="1.0" encoding="'.$lang['charset'].'" ?>'; ?>
+<?php echo '<?xml version="1.0" encoding="' . $lang['charset'] . '" ?>'; ?>
 <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
-<channel>
-<title><?php echo $title; ?></title>
-<link><?php echo BASE_URL; ?></link>
-<description><?php echo $description; ?></description>
-<language><?php echo $lang['lang']; ?></language>
-<?php if(isset($rss_items)): foreach($rss_items as $item): ?>
-<item>
-<title><?php echo $item['title'] ?></title>
-<content:encoded><![CDATA[<?php echo $item['content'] ?>]]></content:encoded>
-<link><?php echo $item['link'] ?></link>
-<pubDate><?php echo $item['pubdate'] ?></pubDate>
-</item>
-<?php endforeach; endif; ?>
-</channel>
-</rss>
+    <channel>
+        <title><?php echo $title; ?></title>
+        <link><?php echo BASE_URL; ?></link>
+        <description><?php echo $description; ?></description>
+        <language><?php echo $lang['lang']; ?></language>
+        <?php if (isset($rss_items)): foreach ($rss_items as $item): ?>
+            <item>
+                <title><?php echo $item['title'] ?></title>
+                <content:encoded><![CDATA[<?php echo $item['content'] ?>]]></content:encoded>
+                <link><?php echo $item['link'] ?></link>
+                <pubDate><?php echo $item['pubdate'] ?></pubDate>
+            </item>
+        <?php endforeach; endif; ?>
+    </channel>
+</rss>
diff --git a/cms/templates/sitemap.tpl b/cms/templates/sitemap.tpl
index 2adc37e..c1ab47a 100644
--- a/cms/templates/sitemap.tpl
+++ b/cms/templates/sitemap.tpl
@@ -1,9 +1,10 @@
-<?php echo '<?xml version="1.0" encoding="'.$lang['charset'].'" ?>'; ?>
-<urlset xmlns="http://www.google.com/schemas/sitemap/0.84" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.google.com/schemas/sitemap/0.84 http://www.google.com/schemas/sitemap/0.84/sitemap.xsd">
-<?php if(isset($sitemap_items)): foreach($sitemap_items as $item): ?>
-<url>
-<loc><?php echo $item['loc'] ?></loc>
-<lastmod><?php echo $item['lastmod'] ?></lastmod>
-</url>
-<?php endforeach; endif; ?>
-</urlset>
+<?php echo '<?xml version="1.0" encoding="' . $lang['charset'] . '" ?>'; ?>
+<urlset xmlns="http://www.google.com/schemas/sitemap/0.84" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.google.com/schemas/sitemap/0.84 http://www.google.com/schemas/sitemap/0.84/sitemap.xsd">
+    <?php if (isset($sitemap_items)): foreach ($sitemap_items as $item): ?>
+        <url>
+            <loc><?php echo $item['loc'] ?></loc>
+            <lastmod><?php echo $item['lastmod'] ?></lastmod>
+        </url>
+    <?php endforeach; endif; ?>
+</urlset>
diff --git a/cms/templates/subtemplates/comments.inc.tpl b/cms/templates/subtemplates/comments.inc.tpl
index dd90cb9..a4b6667 100644
--- a/cms/templates/subtemplates/comments.inc.tpl
+++ b/cms/templates/subtemplates/comments.inc.tpl
@@ -1,145 +1,224 @@
 <div id="comments" class="panel panel-default">
-<div class="panel-heading">
-<?php if($admin): ?>
-<?php if(empty($comments_closed)): ?>
-<a class="btn btn-danger btn-xs pull-right" href="<?php echo BASE_URL . PAGE; ?>,openclose" ><span class="glyphicon glyphicon-lock"></span> <?php echo $lang['comments_close']; ?></a>
-<?php else: ?>
-<a class="btn btn-success btn-xs pull-right" href="<?php echo BASE_URL . PAGE; ?>,openclose"><span class="glyphicon glyphicon-lock"></span> <?php echo $lang['comments_open']; ?></a>
-<?php endif; ?>
-<?php endif; ?>
-<h3 class="panel-title"><?php echo $lang['comment_headline']; ?> <span class="badge"><?php echo $total_comments; ?></span></h3>
-</div>
-
-<div class="panel-body">
-<?php if(isset($edit_data)): ?>
-<form id="commentform" method="post" action="<?php echo $BASE_URL . PAGE; ?>#comments">
-<div>
-<input type="hidden" name="current_page" value="<?php echo $edit_data['current_page']; ?>" />
-<input type="hidden" name="id" value="<?php echo $edit_data['id']; ?>" />
-<p><label for="comment_text"><strong><?php echo $lang['comment_edit_text']; ?></strong></label><br />
-<textarea id="comment_text" class="form-control" name="comment_text" cols="63" rows="10"><?php echo $edit_data['comment']; ?></textarea></p>
-<p class="userdata"><label for="name"><?php echo $lang['comment_input_name']; ?></label><br />
-<input type="text" id="name" class="form-control" name="name" value="<?php echo $edit_data['name']; ?>" size="30" /></p>
-<p class="userdata"><label for="email_hp"><?php echo $lang['comment_input_email_hp']; ?></label><br />
-<input type="text" id="email_hp" class="form-control" name="email_hp" value="<?php echo $edit_data['email_hp']; ?>" size="30" /></p>
-<p><input class="btn btn-primary" name="edit_save" type="submit" value="<?php echo $lang['comment_input_submit']; ?>" /></p>
-</div>
-</form>
-
-<?php else: ?>
-
-<?php if($comments): ?>
-<?php foreach($comments as $comment): ?>
-<div class="comment" id="comment-<?php echo $comment['id']; ?>">
-<h4 class="author"><?php echo $comment['nr']; ?>. <?php if(isset($comment['hp'])): ?><a href="<?php echo $comment['hp']; ?>"><strong><?php echo $comment['name']; ?></strong></a><?php elseif(isset($comment['email'])): ?><a href="mailto:<?php echo $comment['email']; ?>"><strong><?php echo $comment['name']; ?></strong></a><?php else: ?><strong><?php echo $comment['name']; ?></strong><?php endif; ?>, <?php echo $lang['comment_time'][$comment['id']]; ?>:<?php if($admin): ?> <span class="smallx">(<?php echo $comment['ip']; ?>)</span><?php endif; ?></h4>
-<p class="text"><?php echo $comment['comment']; ?></p>
-<?php if($admin): ?>
-<div class="comment-admin">
-<a class="btn btn-primary btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $current_page; ?>,edit,<?php echo $comment['id']; ?>#comments" title="<?php echo $lang['comment_edit_link']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
-<a class="btn btn-danger btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $current_page; ?>,delete,<?php echo $comment['id']; ?>" title="<?php echo $lang['comment_delete_link']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['comment_delete_confirm']); ?>"><span class="glyphicon glyphicon-remove"></span></a>
-</div>
-<?php endif; ?>
-</div>
-<?php endforeach ?>
-<?php else: ?>
-<p class="no-comments"><em><?php echo $lang['comment_no_comments']; ?></em></p>
-<?php endif; ?>
-
-<?php if($pagination): ?>
-<p class="comment-info"><?php echo $lang['comments_pagination_info']; ?></p>
-<ul class="pagination pagination-sm">
-<?php if($pagination['previous']): ?><li><a href="<?php echo BASE_URL . PAGE; if($pagination['previous']>1): ?>,<?php echo $pagination['previous']; endif; ?>#comments">&laquo;</a></li><?php endif; ?>
-<?php foreach($pagination['items'] as $item): ?>
-<?php if(empty($item)): ?><li><span>…</span></li><?php elseif($item==$pagination['current']): ?><li class="active"><a href="#"><?php echo $item; ?></a></li><?php else: ?><li><a href="<?php echo BASE_URL . PAGE; if($item>1): ?>,<?php echo $item; endif; ?>#comments"><?php echo $item; ?></a></li><?php endif; ?>
-<?php endforeach; ?>
-<?php if($pagination['next']): ?><li><a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $pagination['next']; ?>#comments">&raquo;</a></li><?php endif; ?>
-</ul>
-<?php endif; ?>
-
-<?php if($errors): ?>
-<div id="errors" class="alert alert-danger">
-<h3><span class="glyphicon glyphicon-warning-sign"></span> <?php echo $lang['error_headline']; ?></h3>
-<ul>
- <?php foreach($errors as $error): ?>
- <li><?php if(isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
- <?php endforeach; ?>
-</ul>
-<script type="text/javascript">/* <![CDATA[ */ location.hash='errors'; /* ]]> */</script>
-</div>
-<?php endif; ?>
-
-<?php if(empty($comments_closed)): ?>
-
-<?php if(isset($preview) && empty($errors)): ?>
-<div class="alert alert-warning">
-<h3 id="preview"><?php echo $lang['comment_preview_hl']; ?></h3>
-<div class="comment-preview">
-<h4 class="author"><?php if(isset($preview['hp'])): ?><a href="<?php echo $preview['hp']; ?>"><strong><?php echo $preview['name']; ?></strong></a><?php elseif(isset($preview['email'])): ?><a href="mailto:<?php echo $preview['email']; ?>"><strong><?php echo $preview['name']; ?></strong></a><?php else: ?><strong><?php echo $preview['name']; ?></strong><?php endif; ?>, <?php echo $lang['comment_time']['preview']; ?>:</h4>
-<p class="text"><?php echo $preview['comment_text']; ?></p>
-</div>
-</div>
-<script type="text/javascript">/* <![CDATA[ */ location.hash='preview'; /* ]]> */</script>
-<?php endif; ?>
-
-<?php if(empty($preview) && empty($errors)): ?>
-<p><button type="button" class="btn btn-success" data-toggle="collapse" data-target="#commentformwrapper"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['comments_add_comment']; ?></button></p>
-<?php endif; ?>
-
-<div id="commentformwrapper" class="collapse<?php if(isset($preview) || $errors): ?> in<?php endif; ?>">
-
-<form id="commentform" method="post" action="<?php echo $BASE_URL . PAGE; ?>">
-<div>
-<?php if($form_session_data): ?><input type="hidden" name="<?php echo $form_session_data['name']; ?>" value="<?php echo $form_session_data['id']; ?>" /><?php endif; ?>
-
-  <div class="form-group">
-    <label for="comment_text"><?php echo $lang['comment_input_text']; ?></label><br />
-    <textarea id="comment_text" class="form-control" name="comment_text" cols="63" rows="10"><?php echo $form_values['comment_text']; ?></textarea>
-  </div>
-
-  <div class="form-inline">
-  
-  <div class="form-group">
-    <label class="sr-only" for="name"><?php echo $lang['comment_input_name']; ?></label>
-    <input class="form-control" type="text" id="name" name="name" value="<?php echo $form_values['name']; ?>" placeholder="<?php echo $lang['comment_input_name']; ?>" />
-  </div>
-  
-  <div class="form-group">
-    <label class="sr-only" for="email_hp"><?php echo $lang['comment_input_email_hp']; ?></label>
-    <input class="form-control" type="text" id="email_hp" name="email_hp" value="<?php echo $form_values['email_hp']; ?>" placeholder="<?php echo $lang['comment_input_email_hp']; ?>" />
-  </div>
-  
-  <div class="form-group">
-  <input type="submit" class="btn btn-primary" name="save" value="<?php echo $lang['comment_input_submit']; ?>"<?php if(!$form_session): ?> disabled="disabled"<?php endif; ?>>
-  <input type="submit" class="btn btn-primary" name="preview" value="<?php echo $lang['comment_input_preview']; ?>" />
-  </div>
-  
-  </div>
-  
-</div>
-</form>
-
-</div>
-
-<?php endif; ?>
-
-<?php endif; ?>
-
-<?php if($pingbacks): ?>
-<h3 id="pingbacks"><?php echo $lang['pingback_headline']; ?></h3>
-<ol id="pingback-list">
-<?php foreach($pingbacks as $pingback): ?>
-<li><a href="<?php echo $pingback['hp']; ?>"><?php echo $pingback['name']; ?></a><!-- (<?php echo $lang['comment_time'][$pingback['id']]; ?>)-->
-<?php if($admin): ?>
-<br /><span class="small"><a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $current_page; ?>,edit,<?php echo $pingback['id']; ?>#comments"><img src="<?php echo BASE_URL; ?>templates/images/edit_link.png" width="15" height="10" alt="" /><?php echo $lang['comment_edit_link']; ?></a> &nbsp;<a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $current_page; ?>,delete,<?php echo $pingback['id']; ?>" onclick="return confirm_link('<?php echo rawurlencode($lang['comment_delete_confirm']); ?>',this,1)"><img src="<?php echo BASE_URL; ?>templates/images/delete_link.png" width="13" height="9" alt="" /><?php echo $lang['comment_delete_link']; ?></a></span>
-<?php endif; ?>
-</li>
-<?php endforeach; ?>
-</ol>
-<?php endif; ?>
-
-<?php if(isset($comments_closed)): ?>
-<p><em><span class="glyphicon glyphicon-lock"></span> <?php echo $lang['comments_closed']; ?></em></p>
-<?php endif; ?>
-
-</div>
+    <div class="panel-heading">
+        <?php if ($admin): ?>
+            <?php if (empty($comments_closed)): ?>
+                <a class="btn btn-danger btn-xs pull-right" href="<?php echo BASE_URL . PAGE; ?>,openclose">
+                    <span class="glyphicon glyphicon-lock"></span> <?php echo $lang['comments_close']; ?></a>
+            <?php else: ?>
+                <a class="btn btn-success btn-xs pull-right" href="<?php echo BASE_URL . PAGE; ?>,openclose">
+                    <span class="glyphicon glyphicon-lock"></span> <?php echo $lang['comments_open']; ?></a>
+            <?php endif; ?>
+        <?php endif; ?>
+        <h3 class="panel-title"><?php echo $lang['comment_headline']; ?>
+            <span class="badge"><?php echo $total_comments; ?></span></h3>
+    </div>
+
+    <div class="panel-body">
+        <?php if (isset($edit_data)): ?>
+            <form id="commentform" method="post" action="<?php echo $BASE_URL . PAGE; ?>#comments">
+                <div>
+                    <input type="hidden" name="current_page" value="<?php echo $edit_data['current_page']; ?>"/>
+                    <input type="hidden" name="id" value="<?php echo $edit_data['id']; ?>"/>
+
+                    <p><label for="comment_text"><strong><?php echo $lang['comment_edit_text']; ?></strong></label><br/>
+                        <textarea id="comment_text" class="form-control" name="comment_text" cols="63"
+                                  rows="10"><?php echo $edit_data['comment']; ?></textarea></p>
+
+                    <p class="userdata"><label for="name"><?php echo $lang['comment_input_name']; ?></label><br/>
+                        <input type="text" id="name" class="form-control" name="name"
+                               value="<?php echo $edit_data['name']; ?>" size="30"/></p>
+
+                    <p class="userdata"><label
+                            for="email_hp"><?php echo $lang['comment_input_email_hp']; ?></label><br/>
+                        <input type="text" id="email_hp" class="form-control" name="email_hp"
+                               value="<?php echo $edit_data['email_hp']; ?>" size="30"/></p>
+
+                    <p><input class="btn btn-primary" name="edit_save" type="submit"
+                              value="<?php echo $lang['comment_input_submit']; ?>"/></p>
+                </div>
+            </form>
+
+        <?php else: ?>
+
+            <?php if ($comments): ?>
+                <?php foreach ($comments as $comment): ?>
+                    <div class="comment" id="comment-<?php echo $comment['id']; ?>">
+                        <h4 class="author"><?php echo $comment['nr']; ?>. <?php if (isset($comment['hp'])): ?><a
+                                href="<?php echo $comment['hp']; ?>"><strong><?php echo $comment['name']; ?></strong>
+                                </a><?php elseif (isset($comment['email'])): ?><a
+                                href="mailto:<?php echo $comment['email']; ?>">
+                                <strong><?php echo $comment['name']; ?></strong></a><?php
+                            else: ?><strong><?php echo $comment['name']; ?></strong><?php endif; ?>
+                            , <?php echo $lang['comment_time'][$comment['id']]; ?>:<?php if ($admin): ?>
+                                <span class="smallx">(<?php echo $comment['ip']; ?>)</span><?php endif; ?></h4>
+
+                        <p class="text"><?php echo $comment['comment']; ?></p>
+                        <?php if ($admin): ?>
+                            <div class="comment-admin">
+                                <a class="btn btn-primary btn-xs"
+                                   href="<?php echo BASE_URL . PAGE; ?>,<?php echo $current_page; ?>,edit,<?php echo $comment['id']; ?>#comments"
+                                   title="<?php echo $lang['comment_edit_link']; ?>">
+                                    <span class="glyphicon glyphicon-pencil"></span></a>
+                                <a class="btn btn-danger btn-xs"
+                                   href="<?php echo BASE_URL . PAGE; ?>,<?php echo $current_page; ?>,delete,<?php echo $comment['id']; ?>"
+                                   title="<?php echo $lang['comment_delete_link']; ?>"
+                                   data-delete-confirm="<?php echo rawurlencode($lang['comment_delete_confirm']); ?>">
+                                    <span class="glyphicon glyphicon-remove"></span></a>
+                            </div>
+                        <?php endif; ?>
+                    </div>
+                <?php endforeach ?>
+            <?php else: ?>
+                <p class="no-comments"><em><?php echo $lang['comment_no_comments']; ?></em></p>
+            <?php endif; ?>
+
+            <?php if ($pagination): ?>
+                <p class="comment-info"><?php echo $lang['comments_pagination_info']; ?></p>
+                <ul class="pagination pagination-sm">
+                    <?php if ($pagination['previous']): ?>
+                        <li><a href="<?php echo BASE_URL . PAGE;
+                        if ($pagination['previous'] > 1): ?>,<?php echo $pagination['previous']; endif; ?>#comments">&laquo;</a>
+                        </li><?php endif; ?>
+                    <?php foreach ($pagination['items'] as $item): ?>
+                        <?php if (empty($item)): ?>
+                            <li><span>…</span></li><?php elseif ($item == $pagination['current']): ?>
+                            <li class="active"><a href="#"><?php echo $item; ?></a></li><?php
+                        else: ?>
+                            <li><a href="<?php echo BASE_URL . PAGE;
+                            if ($item > 1): ?>,<?php echo $item; endif; ?>#comments"><?php echo $item; ?></a>
+                            </li><?php endif; ?>
+                    <?php endforeach; ?>
+                    <?php if ($pagination['next']): ?>
+                        <li><a
+                            href="<?php echo BASE_URL . PAGE; ?>,<?php echo $pagination['next']; ?>#comments">&raquo;</a>
+                        </li><?php endif; ?>
+                </ul>
+            <?php endif; ?>
+
+            <?php if ($errors): ?>
+                <div id="errors" class="alert alert-danger">
+                    <h3><span class="glyphicon glyphicon-warning-sign"></span> <?php echo $lang['error_headline']; ?>
+                    </h3>
+                    <ul>
+                        <?php foreach ($errors as $error): ?>
+                            <li><?php if (isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
+                        <?php endforeach; ?>
+                    </ul>
+                    <script type="text/javascript">/* <![CDATA[ */
+                        location.hash = 'errors';
+                        /* ]]> */</script>
+                </div>
+            <?php endif; ?>
+
+            <?php if (empty($comments_closed)): ?>
+
+                <?php if (isset($preview) && empty($errors)): ?>
+                    <div class="alert alert-warning">
+                        <h3 id="preview"><?php echo $lang['comment_preview_hl']; ?></h3>
+
+                        <div class="comment-preview">
+                            <h4 class="author"><?php if (isset($preview['hp'])): ?>
+                                <a href="<?php echo $preview['hp']; ?>">
+                                    <strong><?php echo $preview['name']; ?></strong>
+                                </a><?php elseif (isset($preview['email'])): ?>
+                                <a href="mailto:<?php echo $preview['email']; ?>">
+                                    <strong><?php echo $preview['name']; ?></strong>
+                                </a><?php
+                                else: ?><strong><?php echo $preview['name']; ?></strong><?php endif; ?>
+                                , <?php echo $lang['comment_time']['preview']; ?>:</h4>
+
+                            <p class="text"><?php echo $preview['comment_text']; ?></p>
+                        </div>
+                    </div>
+                    <script type="text/javascript">/* <![CDATA[ */
+                        location.hash = 'preview';
+                        /* ]]> */</script>
+                <?php endif; ?>
+
+                <?php if (empty($preview) && empty($errors)): ?>
+                    <p>
+                        <button type="button" class="btn btn-success" data-toggle="collapse"
+                                data-target="#commentformwrapper">
+                            <span class="glyphicon glyphicon-plus"></span> <?php echo $lang['comments_add_comment']; ?>
+                        </button>
+                    </p>
+                <?php endif; ?>
+
+                <div id="commentformwrapper"
+                     class="collapse<?php if (isset($preview) || $errors): ?> in<?php endif; ?>">
+
+                    <form id="commentform" method="post" action="<?php echo $BASE_URL . PAGE; ?>">
+                        <div>
+                            <?php if ($form_session_data): ?>
+                                <input type="hidden"
+                                        name="<?php echo $form_session_data['name']; ?>"
+                                        value="<?php echo $form_session_data['id']; ?>" /><?php endif; ?>
+
+                            <div class="form-group">
+                                <label for="comment_text"><?php echo $lang['comment_input_text']; ?></label><br/>
+                                <textarea id="comment_text" class="form-control" name="comment_text" cols="63"
+                                          rows="10"><?php echo $form_values['comment_text']; ?></textarea>
+                            </div>
+
+                            <div class="form-inline">
+
+                                <div class="form-group">
+                                    <label class="sr-only" for="name"><?php echo $lang['comment_input_name']; ?></label>
+                                    <input class="form-control" type="text" id="name" name="name"
+                                           value="<?php echo $form_values['name']; ?>"
+                                           placeholder="<?php echo $lang['comment_input_name']; ?>"/>
+                                </div>
+
+                                <div class="form-group">
+                                    <label class="sr-only"
+                                           for="email_hp"><?php echo $lang['comment_input_email_hp']; ?></label>
+                                    <input class="form-control" type="text" id="email_hp" name="email_hp"
+                                           value="<?php echo $form_values['email_hp']; ?>"
+                                           placeholder="<?php echo $lang['comment_input_email_hp']; ?>"/>
+                                </div>
+
+                                <div class="form-group">
+                                    <input type="submit" class="btn btn-primary" name="save"
+                                           value="<?php echo $lang['comment_input_submit']; ?>"<?php if (!$form_session): ?> disabled="disabled"<?php endif; ?>>
+                                    <input type="submit" class="btn btn-primary" name="preview"
+                                           value="<?php echo $lang['comment_input_preview']; ?>"/>
+                                </div>
+
+                            </div>
+
+                        </div>
+                    </form>
+
+                </div>
+
+            <?php endif; ?>
+
+        <?php endif; ?>
+
+        <?php if ($pingbacks): ?>
+            <h3 id="pingbacks"><?php echo $lang['pingback_headline']; ?></h3>
+            <ol id="pingback-list">
+                <?php foreach ($pingbacks as $pingback): ?>
+                    <li>
+                        <a href="<?php echo $pingback['hp']; ?>"><?php echo $pingback['name']; ?></a><!-- (<?php echo $lang['comment_time'][$pingback['id']]; ?>)-->
+                        <?php if ($admin): ?>
+                            <br/><span class="small">
+                                <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $current_page; ?>,edit,<?php echo $pingback['id']; ?>#comments">
+                                    <img src="<?php echo BASE_URL; ?>templates/images/edit_link.png" width="15"
+                                        height="10" alt=""/><?php echo $lang['comment_edit_link']; ?></a> &nbsp;
+                                <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $current_page; ?>,delete,<?php echo $pingback['id']; ?>"
+                                    onclick="return confirm_link('<?php echo rawurlencode($lang['comment_delete_confirm']); ?>',this,1)">
+                                    <img src="<?php echo BASE_URL; ?>templates/images/delete_link.png" width="13"
+                                        height="9" alt=""/><?php echo $lang['comment_delete_link']; ?></a></span>
+                        <?php endif; ?>
+                    </li>
+                <?php endforeach; ?>
+            </ol>
+        <?php endif; ?>
+
+        <?php if (isset($comments_closed)): ?>
+            <p><em><span class="glyphicon glyphicon-lock"></span> <?php echo $lang['comments_closed']; ?></em></p>
+        <?php endif; ?>
+
+    </div>
 </div>
diff --git a/cms/templates/subtemplates/formmailer.inc.tpl b/cms/templates/subtemplates/formmailer.inc.tpl
index 44ccfcf..2b82e63 100644
--- a/cms/templates/subtemplates/formmailer.inc.tpl
+++ b/cms/templates/subtemplates/formmailer.inc.tpl
@@ -1,42 +1,49 @@
-<?php if(isset($mail_sent)): ?>
+<?php if (isset($mail_sent)): ?>
 
-<div class="alert alert-success"><span class="glyphicon glyphicon-ok"></span> <?php echo $lang['formmailer_mail_sent']; ?></div>
+    <div class="alert alert-success"><span
+            class="glyphicon glyphicon-ok"></span> <?php echo $lang['formmailer_mail_sent']; ?></div>
 
 <?php else: ?>
 
-<?php if(isset($errors)): ?>
-<div class="alert alert-danger">
-<h3><span class="glyphicon glyphicon-warning-sign"></span> <?php echo $lang['error_headline']; ?></h3>
-<ul>
-<?php foreach($errors as $error): ?>
-<li><?php if(isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
-<?php endforeach; ?>
-</ul>
-</div>
-<?php endif; ?>
-
-<form method="post" action="<?php echo BASE_URL.PAGE; ?>" accept-charset="<?php echo CHARSET; ?>">
-<input type="hidden" name="send" value="true">
-<div>
-
-<div class="form-group">
-<label for="email"><?php echo $lang['formmailer_label_email']; ?></label>
-<input id="email" class="form-control" type="email" name="email">
-</div>
-
-<div class="form-group">
-<label for="subject"><?php echo $lang['formmailer_label_subject']; ?></label>
-<input id="subject" class="form-control" type="text" name="subject">
-</div>
-
-<div class="form-group">
-<label for="message"><?php echo $lang['formmailer_label_message']; ?></label>
-<textarea id="message" class="form-control" name="message" rows="12"><?php if(isset($message)) echo $message; ?></textarea>
-</div>
-
-<p><button class="btn btn-primary btn-lg" type="submit"><span class="glyphicon glyphicon-envelope"></span> <?php echo $lang['formmailer_button_send']; ?></button></p>
-
-</div>
-</form>
+    <?php if (isset($errors)): ?>
+        <div class="alert alert-danger">
+            <h3><span class="glyphicon glyphicon-warning-sign"></span> <?php echo $lang['error_headline']; ?></h3>
+            <ul>
+                <?php foreach ($errors as $error): ?>
+                    <li><?php if (isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
+                <?php endforeach; ?>
+            </ul>
+        </div>
+    <?php endif; ?>
+
+    <form method="post" action="<?php echo BASE_URL . PAGE; ?>" accept-charset="<?php echo CHARSET; ?>">
+        <input type="hidden" name="send" value="true">
+
+        <div>
+
+            <div class="form-group">
+                <label for="email"><?php echo $lang['formmailer_label_email']; ?></label>
+                <input id="email" class="form-control" type="email" name="email">
+            </div>
+
+            <div class="form-group">
+                <label for="subject"><?php echo $lang['formmailer_label_subject']; ?></label>
+                <input id="subject" class="form-control" type="text" name="subject">
+            </div>
+
+            <div class="form-group">
+                <label for="message"><?php echo $lang['formmailer_label_message']; ?></label>
+                <textarea id="message" class="form-control" name="message"
+                          rows="12"><?php if (isset($message)) echo $message; ?></textarea>
+            </div>
+
+            <p>
+                <button class="btn btn-primary btn-lg" type="submit"><span
+                        class="glyphicon glyphicon-envelope"></span> <?php echo $lang['formmailer_button_send']; ?>
+                </button>
+            </p>
+
+        </div>
+    </form>
 
 <?php endif; ?>
diff --git a/cms/templates/subtemplates/gallery.inc.tpl b/cms/templates/subtemplates/gallery.inc.tpl
index 0f72485..c7519a3 100644
--- a/cms/templates/subtemplates/gallery.inc.tpl
+++ b/cms/templates/subtemplates/gallery.inc.tpl
@@ -1,30 +1,46 @@
-<?php $photos_per_row=3; if(isset($photos)): ?>
-
-<?php for($i=0;$i<$number_of_photos;$i=$i+$photos_per_row): ?>
-<div class="row">
-<?php for($n=$i;$n<$i+$photos_per_row;++$n): ?>
-<div class="col-xs-4">
-<?php if(isset($photos[$n])): ?>
-
-<?php if($settings['lightbox_enabled']): ?>
-<div class="thumbnail-wrapper">
-<a class="thumbnail" href="<?php echo BASE_URL . MEDIA_DIR. $photos[$n]['photo_normal']; ?>" data-lightbox><img src="<?php echo BASE_URL.MEDIA_DIR.$photos[$n]['photo_thumbnail']; ?>" title="<?php echo $photos[$n]['title']; ?>" alt="<?php echo $photos[$n]['title']; ?>" data-subtitle="<?php echo $photos[$n]['subtitle']; ?>" data-description="<?php echo $photos[$n]['description']; ?>" width="<?php echo $photos[$n]['width']; ?>" height="<?php echo $photos[$n]['height']; ?>" /></a>
-</div>
-<?php else: ?>
-<a class="thumbnail" href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photos[$n]['id']; ?>"><img src="<?php echo BASE_URL.MEDIA_DIR.$photos[$n]['photo_thumbnail']; ?>" title="<?php echo $photos[$n]['title']; ?>" alt="<?php echo $photos[$n]['title']; ?>" width="<?php echo $photos[$n]['width']; ?>" height="<?php $photos[$n]['height']; ?>" /></a>
-<?php endif; ?>
-
-<?php else: ?>
-<?php endif; ?>
-
-</div>
-<?php endfor; ?>
-
-</div>
-<?php endfor; ?>
+<?php $photos_per_row = 3;
+if (isset($photos)): ?>
+
+    <?php for ($i = 0; $i < $number_of_photos; $i = $i + $photos_per_row): ?>
+        <div class="row">
+            <?php for ($n = $i; $n < $i + $photos_per_row; ++$n): ?>
+                <div class="col-xs-4">
+                    <?php if (isset($photos[$n])): ?>
+
+                        <?php if ($settings['lightbox_enabled']): ?>
+                            <div class="thumbnail-wrapper">
+                                <a class="thumbnail"
+                                   href="<?php echo BASE_URL . MEDIA_DIR . $photos[$n]['photo_normal']; ?>"
+                                   data-lightbox><img
+                                        src="<?php echo BASE_URL . MEDIA_DIR . $photos[$n]['photo_thumbnail']; ?>"
+                                        title="<?php echo $photos[$n]['title']; ?>"
+                                        alt="<?php echo $photos[$n]['title']; ?>"
+                                        data-subtitle="<?php echo $photos[$n]['subtitle']; ?>"
+                                        data-description="<?php echo $photos[$n]['description']; ?>"
+                                        width="<?php echo $photos[$n]['width']; ?>"
+                                        height="<?php echo $photos[$n]['height']; ?>"/></a>
+                            </div>
+                        <?php else: ?>
+                            <a class="thumbnail"
+                               href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photos[$n]['id']; ?>"><img
+                                    src="<?php echo BASE_URL . MEDIA_DIR . $photos[$n]['photo_thumbnail']; ?>"
+                                    title="<?php echo $photos[$n]['title']; ?>"
+                                    alt="<?php echo $photos[$n]['title']; ?>"
+                                    width="<?php echo $photos[$n]['width']; ?>"
+                                    height="<?php $photos[$n]['height']; ?>"/></a>
+                        <?php endif; ?>
+
+                    <?php else: ?>
+                    <?php endif; ?>
+
+                </div>
+            <?php endfor; ?>
+
+        </div>
+    <?php endfor; ?>
 
 
 
 <?php else: ?>
 <p><em>No photo in this gallery</em><p>
-<?php endif; ?>
+    <?php endif; ?>
diff --git a/cms/templates/subtemplates/image.inc.tpl b/cms/templates/subtemplates/image.inc.tpl
index 19749c3..9984caf 100644
--- a/cms/templates/subtemplates/image.inc.tpl
+++ b/cms/templates/subtemplates/image.inc.tpl
@@ -1,5 +1,8 @@
-<?php if(isset($image)): ?>
-<img<?php if(isset($image['class'])): ?> class="<?php echo $image['class']; ?>" <?php endif; ?> src="<?php echo BASE_URL.MEDIA_DIR.$image['image']; ?>" title="<?php echo $image['alt']; ?>" alt="<?php echo $image['alt']; ?>" width="<?php echo $image['width']; ?>" height="<?php echo $image['height']; ?>" />
+<?php if (isset($image)): ?>
+    <img<?php if (isset($image['class'])): ?> class="<?php echo $image['class']; ?>" <?php endif; ?>
+        src="<?php echo BASE_URL . MEDIA_DIR . $image['image']; ?>" title="<?php echo $image['alt']; ?>"
+        alt="<?php echo $image['alt']; ?>" width="<?php echo $image['width']; ?>"
+        height="<?php echo $image['height']; ?>"/>
 <?php else: ?>
-<span class="missing">[ missing image ]</span>
+    <span class="missing">[ missing image ]</span>
 <?php endif; ?>
diff --git a/cms/templates/subtemplates/news.inc.tpl b/cms/templates/subtemplates/news.inc.tpl
index 96961d1..fd64295 100644
--- a/cms/templates/subtemplates/news.inc.tpl
+++ b/cms/templates/subtemplates/news.inc.tpl
@@ -1,42 +1,64 @@
-<?php if($news): ?>
-<?php foreach($news as $item): ?>
+<?php if ($news): ?>
+    <?php foreach ($news as $item): ?>
 
-<div class="news">
+        <div class="news">
 
-<p class="time"><?php echo $lang['news_time'][$item['id']]; ?></p>
+            <p class="time"><?php echo $lang['news_time'][$item['id']]; ?></p>
 
-<h2 class="media-heading"><a href="<?php echo BASE_URL.$item['page']; ?>"><?php echo $item['teaser_headline']; ?></a></h2>
+            <h2 class="media-heading"><a
+                    href="<?php echo BASE_URL . $item['page']; ?>"><?php echo $item['teaser_headline']; ?></a></h2>
 
-<div class="media">
+            <div class="media">
 
-<?php if(isset($item['teaser_img'])): ?>
-<a class="pull-left thumbnail" href="<?php echo BASE_URL.$item['page']; ?>"><img class="media-object" src="<?php echo BASE_URL.MEDIA_DIR.$item['teaser_img']; ?>" alt="<?php echo $item['teaser_headline']; ?>" width="<?php echo $item['teaser_img_width']; ?>" height="<?php echo $item['teaser_img_height']; ?>" /></a>
-<?php endif; ?>
+                <?php if (isset($item['teaser_img'])): ?>
+                    <a class="pull-left thumbnail" href="<?php echo BASE_URL . $item['page']; ?>">
+                        <img class="media-object" src="<?php echo BASE_URL . MEDIA_DIR . $item['teaser_img']; ?>"
+                            alt="<?php echo $item['teaser_headline']; ?>"
+                            width="<?php echo $item['teaser_img_width']; ?>"
+                            height="<?php echo $item['teaser_img_height']; ?>"/></a>
+                <?php endif; ?>
 
 
 
-<?php if(isset($item['teaser'])): ?>
-<p><?php echo $item['teaser']; ?></p>
-<?php endif; ?>
+                <?php if (isset($item['teaser'])): ?>
+                    <p><?php echo $item['teaser']; ?></p>
+                <?php endif; ?>
 
-<p><a class="btn btn-primary" href="<?php echo BASE_URL.$item['page']; ?>"><?php echo $item['link_name']; ?></a>
-<?php if(isset($item['comments'])): ?><a class="btn btn-default" href="<?php echo BASE_URL.$item['page']; ?>#comments" class="comments"><?php echo $lang['number_of_comments'][$item['id']]; ?></a><?php endif; ?></p>
+                <p><a class="btn btn-primary"
+                      href="<?php echo BASE_URL . $item['page']; ?>"><?php echo $item['link_name']; ?></a>
+                    <?php if (isset($item['comments'])): ?>
+                        <a class="btn btn-default"
+                          href="<?php echo BASE_URL . $item['page']; ?>#comments"
+                          class="comments"><?php echo $lang['number_of_comments'][$item['id']]; ?></a>
+                    <?php endif; ?>
+                </p>
 
-</div>
-</div>
-<?php endforeach; ?>
+            </div>
+        </div>
+    <?php endforeach; ?>
 
-<?php if($pagination): ?>
-<!--<p><?php echo $lang['pagination']; ?></p>-->
-<ul class="pagination">
-<?php if($pagination['previous']): ?><li><a href="<?php echo BASE_URL . PAGE; if($pagination['previous']>1||$current_category): ?>,<?php if($current_category) echo CATEGORY_IDENTIFIER.$current_category_urlencoded; ?><?php if($pagination['previous']>1): ?>,<?php echo $pagination['previous']; endif; endif; ?>">&laquo;</a></li><?php endif; ?><?php foreach($pagination['items'] as $item): ?><?php if(empty($item)): ?><li>..</li><?php elseif($item==$pagination['current']): ?><li class="active"><a href="#"><?php echo $item; ?></a></li><?php else: ?><li><a href="<?php echo BASE_URL . PAGE; if($item>1||$current_category): ?>,<?php if($current_category) echo CATEGORY_IDENTIFIER.$current_category_urlencoded; ?><?php if($item>1): ?>,<?php echo $item; endif; endif; ?>"><?php echo $item; ?></a></li><?php endif; ?><?php endforeach; ?><?php if($pagination['next']): ?><li><a href="<?php echo BASE_URL . PAGE; ?>,<?php if($current_category) echo CATEGORY_IDENTIFIER.$current_category_urlencoded; ?><?php if($pagination['next']>1): ?>,<?php echo $pagination['next']; ?><?php endif; ?>">&raquo;</a></li><?php endif; ?>
-</ul>
-<?php endif; ?>
+    <?php if ($pagination): ?>
+        <!--<p><?php echo $lang['pagination']; ?></p>-->
+        <ul class="pagination">
+            <?php if ($pagination['previous']): ?>
+                <li><a href="<?php echo BASE_URL . PAGE;
+                if ($pagination['previous'] > 1 || $current_category): ?>,<?php if ($current_category) echo CATEGORY_IDENTIFIER . $current_category_urlencoded; ?><?php if ($pagination['previous'] > 1): ?>,<?php echo $pagination['previous']; endif; endif; ?>">&laquo;</a>
+                </li><?php endif; ?><?php foreach ($pagination['items'] as $item): ?><?php if (empty($item)): ?>
+                <li>..</li><?php elseif ($item == $pagination['current']): ?>
+                <li class="active"><a href="#"><?php echo $item; ?></a></li><?php
+            else: ?>
+                <li><a href="<?php echo BASE_URL . PAGE;
+                if ($item > 1 || $current_category): ?>,<?php if ($current_category) echo CATEGORY_IDENTIFIER . $current_category_urlencoded; ?><?php if ($item > 1): ?>,<?php echo $item; endif; endif; ?>"><?php echo $item; ?></a>
+                </li><?php endif; ?><?php endforeach; ?><?php if ($pagination['next']): ?>
+                <li><a href="<?php echo BASE_URL . PAGE; ?>,<?php if ($current_category) echo CATEGORY_IDENTIFIER . $current_category_urlencoded; ?><?php if ($pagination['next'] > 1): ?>,<?php echo $pagination['next']; ?><?php endif; ?>">&raquo;</a>
+                </li><?php endif; ?>
+        </ul>
+    <?php endif; ?>
 
 <?php else: ?>
 
-<div class="alert alert-warning">
-<?php echo $lang['no_news']; ?>
-</div>
+    <div class="alert alert-warning">
+        <?php echo $lang['no_news']; ?>
+    </div>
 
 <?php endif; ?>
diff --git a/cms/templates/subtemplates/notes.inc.tpl b/cms/templates/subtemplates/notes.inc.tpl
index 5607fe5..ef6f2f0 100644
--- a/cms/templates/subtemplates/notes.inc.tpl
+++ b/cms/templates/subtemplates/notes.inc.tpl
@@ -1,26 +1,38 @@
-<?php if(isset($notes)): ?>
+<?php if (isset($notes)): ?>
 
-<?php foreach($notes as $note): ?>
-<div class="news">
-<p class="time"><?php echo $lang['note_time'][$note['id']]; ?></p>
-<h2><?php if($note['link']): ?><a href="<?php echo $note['link']; ?>"><?php echo $note['title']; ?></a><?php else: ?><?php echo $note['title']; ?><?php endif; ?></h2>
-<?php if($note['text']): ?><p><?php echo $note['text']; ?></p><?php endif; ?>
-<?php if($note['linkname']): ?><p class="link"><a class="btn btn-primary" href="<?php echo $note['link']; ?>"><?php echo $note['linkname']; ?></a></p><?php endif; ?>
-</div>
-<?php endforeach; ?>
+    <?php foreach ($notes as $note): ?>
+        <div class="news">
+            <p class="time"><?php echo $lang['note_time'][$note['id']]; ?></p>
 
-<?php if($pagination): ?>
-<p class="pagination"><?php echo $lang['pagination']; ?> [ 
-<?php if($pagination['previous']): ?> <a href="<?php echo BASE_URL . PAGE; if($pagination['previous']>1): ?>,<?php echo $pagination['previous']; endif; ?>">&laquo;</a> <?php endif; ?>
-<?php foreach($pagination['items'] as $item): ?>
-<?php if(empty($item)): ?> ..<?php elseif($item==$pagination['current']): ?> <span class="current"><?php echo $item; ?></span><?php else: ?> <a href="<?php echo BASE_URL . PAGE; if($item>1): ?>,<?php echo $item; endif; ?>"><?php echo $item; ?></a><?php endif; ?>
-<?php endforeach; ?>
-<?php if($pagination['next']): ?> <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $pagination['next']; ?>">&raquo;</a><?php endif; ?>  
-]</p>
-<?php endif; ?>
+            <h2><?php if ($note['link']): ?>
+                    <a href="<?php echo $note['link']; ?>"><?php echo $note['title']; ?></a><?php else: ?><?php echo $note['title']; ?><?php endif; ?>
+            </h2>
+            <?php if ($note['text']): ?><p><?php echo $note['text']; ?></p><?php endif; ?>
+            <?php if ($note['linkname']): ?><p class="link">
+                <a class="btn btn-primary"
+                    href="<?php echo $note['link']; ?>"><?php echo $note['linkname']; ?></a>
+                </p><?php endif; ?>
+        </div>
+    <?php endforeach; ?>
+
+    <?php if ($pagination): ?>
+        <p class="pagination"><?php echo $lang['pagination']; ?> [
+            <?php if ($pagination['previous']): ?> <a href="<?php echo BASE_URL . PAGE;
+            if ($pagination['previous'] > 1): ?>,<?php echo $pagination['previous']; endif; ?>">&laquo;</a> <?php endif; ?>
+            <?php foreach ($pagination['items'] as $item): ?>
+                <?php if (empty($item)): ?> ..<?php elseif ($item == $pagination['current']): ?>
+                    <span class="current"><?php echo $item; ?></span><?php
+                else: ?> <a href="<?php echo BASE_URL . PAGE;
+                if ($item > 1): ?>,<?php echo $item; endif; ?>"><?php echo $item; ?></a><?php endif; ?>
+            <?php endforeach; ?>
+            <?php if ($pagination['next']): ?> <a
+                href="<?php echo BASE_URL . PAGE; ?>,<?php echo $pagination['next']; ?>">&raquo;</a><?php endif; ?>
+            ]</p>
+    <?php endif; ?>
 
 <?php else: ?>
 
-<?php echo $lang['no_notes']; ?>
+    <?php echo $lang['no_notes']; ?>
 
 <?php endif; ?>
+S
\ No newline at end of file
diff --git a/cms/templates/subtemplates/overview.inc.tpl b/cms/templates/subtemplates/overview.inc.tpl
index afffc2c..334b8be 100644
--- a/cms/templates/subtemplates/overview.inc.tpl
+++ b/cms/templates/subtemplates/overview.inc.tpl
@@ -1,26 +1,37 @@
-<?php if(isset($included_pages)): ?>
+<?php if (isset($included_pages)): ?>
 
-<?php for($i=0;$i<$included_pages_number;$i=$i+2): ?>
-<div class="row">
-<?php for($n=$i;$n<$i+2;++$n): ?>
-<div class="col-md-6">
+    <?php for ($i = 0; $i < $included_pages_number; $i = $i + 2): ?>
+        <div class="row">
+            <?php for ($n = $i; $n < $i + 2; ++$n): ?>
+                <div class="col-md-6">
 
-<?php if(isset($included_pages[$n])): ?>
-<div class="overview">
-<h2 class="teaser"><a href="<?php echo BASE_URL.$included_pages[$n]['page']; ?>"><?php echo $included_pages[$n]['teaser_headline']; ?></a></h2>
-<div class="media">
-<?php if($included_pages[$n]['teaser_img']): ?>
-<a class="thumbnail thumbnail-left" href="<?php echo BASE_URL.$included_pages[$n]['page']; ?>"><img src="<?php echo BASE_URL.MEDIA_DIR.$included_pages[$n]['teaser_img']; ?>" alt="<?php echo $included_pages[$n]['teaser_headline']; ?>" width="<?php echo $included_pages[$n]['teaser_img_width']; ?>" height="<?php echo $included_pages[$n]['teaser_img_height']; ?>" /></a>
-<?php endif; ?>
-<p class="teaser"><?php echo $included_pages[$n]['teaser']; ?></p>
-<p><a class="btn btn-primary" href="<?php echo BASE_URL.$included_pages[$n]['page']; ?>"><?php echo $included_pages[$n]['link_name']; ?></a></p>
-<?php endif; ?>
-</div>
-</div>
-</div>
-<?php endfor; ?>
+                    <?php if (isset($included_pages[$n])): ?>
+                    <div class="overview">
+                        <h2 class="teaser"><a
+                                href="<?php echo BASE_URL . $included_pages[$n]['page']; ?>"><?php echo $included_pages[$n]['teaser_headline']; ?></a>
+                        </h2>
+
+                        <div class="media">
+                            <?php if ($included_pages[$n]['teaser_img']): ?>
+                                <a class="thumbnail thumbnail-left"
+                                   href="<?php echo BASE_URL . $included_pages[$n]['page']; ?>"><img
+                                        src="<?php echo BASE_URL . MEDIA_DIR . $included_pages[$n]['teaser_img']; ?>"
+                                        alt="<?php echo $included_pages[$n]['teaser_headline']; ?>"
+                                        width="<?php echo $included_pages[$n]['teaser_img_width']; ?>"
+                                        height="<?php echo $included_pages[$n]['teaser_img_height']; ?>"/></a>
+                            <?php endif; ?>
+                            <p class="teaser"><?php echo $included_pages[$n]['teaser']; ?></p>
+
+                            <p><a class="btn btn-primary"
+                                  href="<?php echo BASE_URL . $included_pages[$n]['page']; ?>"><?php echo $included_pages[$n]['link_name']; ?></a>
+                            </p>
+                            <?php endif; ?>
+                        </div>
+                    </div>
+                </div>
+            <?php endfor; ?>
 
-</div>
-<?php endfor; ?>
+        </div>
+    <?php endfor; ?>
 
 <?php endif; ?>
diff --git a/cms/templates/subtemplates/photo_comments.inc.tpl b/cms/templates/subtemplates/photo_comments.inc.tpl
index b8e6ce5..cb21d1a 100644
--- a/cms/templates/subtemplates/photo_comments.inc.tpl
+++ b/cms/templates/subtemplates/photo_comments.inc.tpl
@@ -1,82 +1,138 @@
-<?php if(isset($edit_data)): ?>
-<h3 id="comments"><?php echo $lang['comment_headline']; ?></h3>
-<form id="commentform" method="post" action="<?php echo $BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>">
-<div>
-<input type="hidden" name="current_page" value="<?php echo $edit_data['current_page']; ?>" />
-<input type="hidden" name="id" value="<?php echo $edit_data['id']; ?>" />
-<p><label for="comment_text"><strong><?php echo $lang['comment_edit_text']; ?></strong></label><br />
-<textarea id="comment_text" name="comment_text" cols="63" rows="10"><?php echo $edit_data['comment']; ?></textarea></p>
-<p class="userdata"><label for="name"><?php echo $lang['comment_input_name']; ?></label><br />
-<input type="text" id="name" name="name" value="<?php echo $edit_data['name']; ?>" size="30" /></p>
-<p class="userdata"><label for="email_hp"><?php echo $lang['comment_input_email_hp']; ?></label><br />
-<input type="text" id="email_hp" name="email_hp" value="<?php echo $edit_data['email_hp']; ?>" size="30" /></p>
-<p><input name="edit_save" type="submit" value="<?php echo $lang['comment_input_submit']; ?>" /></p>
-</div>
-</form>
-<?php else: ?>
-<div id="commentcontainer" style="<?php if($show_comments): ?>display:block;<?php else: ?>display:none;<?php endif; ?>">
-<h3 id="comments"><?php echo $lang['comment_headline']; ?></h3>
-<?php if($comments): ?>
-<?php foreach($comments as $comment): ?>
-<div class="comments">
-<p class="author">#<?php echo $comment['nr']; ?> - <?php if(isset($comment['hp'])): ?><a href="<?php echo $comment['hp']; ?>"><strong><?php echo $comment['name']; ?></strong></a><?php elseif(isset($comment['email'])): ?><a href="mailto:<?php echo $comment['email']; ?>"><strong><?php echo $comment['name']; ?></strong></a><?php else: ?><strong><?php echo $comment['name']; ?></strong><?php endif; ?>, <?php echo $lang['comment_time'][$comment['id']]; ?>:<?php if($admin): ?> <span class="smallx">(<?php echo $comment['ip']; ?>)</span><?php endif; ?></p>
-<p class="text"><?php echo $comment['comment']; ?></p>
-<?php if($admin): ?>
-<p class="admin"><a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,edit,<?php echo $comment['id']; ?>,<?php echo $current_page; ?>#comments"><img src="<?php echo BASE_URL; ?>templates/images/edit_link.png" width="15" height="10" alt="" /><?php echo $lang['comment_edit_link']; ?></a> &nbsp;<a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,delete,<?php echo $comment['id']; ?>,<?php echo $current_page; ?>#comments" onclick="return confirm_link('<?php echo rawurlencode($lang['comment_delete_confirm']); ?>',this,1)"><img src="<?php echo BASE_URL; ?>templates/images/delete_link.png" width="13" height="9" alt="" /><?php echo $lang['comment_delete_link']; ?></a></p>
-<?php endif; ?>
-</div>
-<?php endforeach ?>
+<?php if (isset($edit_data)): ?>
+    <h3 id="comments"><?php echo $lang['comment_headline']; ?></h3>
+    <form id="commentform" method="post"
+          action="<?php echo $BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>">
+        <div>
+            <input type="hidden" name="current_page" value="<?php echo $edit_data['current_page']; ?>"/>
+            <input type="hidden" name="id" value="<?php echo $edit_data['id']; ?>"/>
+
+            <p><label for="comment_text"><strong><?php echo $lang['comment_edit_text']; ?></strong></label><br/>
+                <textarea id="comment_text" name="comment_text" cols="63"
+                          rows="10"><?php echo $edit_data['comment']; ?></textarea></p>
+
+            <p class="userdata"><label for="name"><?php echo $lang['comment_input_name']; ?></label><br/>
+                <input type="text" id="name" name="name" value="<?php echo $edit_data['name']; ?>" size="30"/></p>
+
+            <p class="userdata"><label for="email_hp"><?php echo $lang['comment_input_email_hp']; ?></label><br/>
+                <input type="text" id="email_hp" name="email_hp" value="<?php echo $edit_data['email_hp']; ?>"
+                       size="30"/></p>
+
+            <p><input name="edit_save" type="submit" value="<?php echo $lang['comment_input_submit']; ?>"/></p>
+        </div>
+    </form>
 <?php else: ?>
-<p><i><?php echo $lang['comment_no_comments']; ?></i></p>
-<?php endif; ?>
+<div id="commentcontainer"
+     style="<?php if ($show_comments): ?>display:block;<?php else: ?>display:none;<?php endif; ?>">
+    <h3 id="comments"><?php echo $lang['comment_headline']; ?></h3>
+    <?php if ($comments): ?>
+        <?php foreach ($comments as $comment): ?>
+            <div class="comments">
+                <p class="author">#<?php echo $comment['nr']; ?> - <?php if (isset($comment['hp'])): ?>
+                    <a href="<?php echo $comment['hp']; ?>"><strong><?php echo $comment['name']; ?></strong>
+                        </a><?php elseif (isset($comment['email'])): ?>
+                    <a href="mailto:<?php echo $comment['email']; ?>"><strong><?php echo $comment['name']; ?></strong>
+                        </a><?php
+                    else: ?><strong><?php echo $comment['name']; ?></strong><?php endif; ?>
+                    , <?php echo $lang['comment_time'][$comment['id']]; ?>:<?php if ($admin): ?> <span class="smallx">
+                        (<?php echo $comment['ip']; ?>)</span><?php endif; ?></p>
 
-<?php if($pagination): ?>
-<p class="pagination"><?php echo $lang['comments_pagination_info']; ?> [ 
-<?php if($pagination['previous']): ?> <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1<?php if($pagination['previous']>1): ?>,<?php echo $pagination['previous']; endif; ?>#comments">&laquo;</a> <?php endif; ?>
-<?php foreach($pagination['items'] as $item): ?>
-<?php if(empty($item)): ?> ..<?php elseif($item==$pagination['current']): ?> <span class="current"><?php echo $item; ?></span><?php else: ?> <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1<?php if($item>1): ?>,<?php echo $item; endif; ?>#comments"><?php echo $item; ?></a><?php endif; ?>
-<?php endforeach; ?>
-<?php if($pagination['next']): ?> <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1,<?php echo $pagination['next']; ?>#comments">&raquo;</a><?php endif; ?>  
-]</p>
-<?php endif; ?>
-
-<?php if($errors): ?>
-<p class="caution"><?php echo $lang['error_headline']; ?></p>
-<ul>
- <?php foreach($errors as $error): ?>
- <li><?php if(isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
- <?php endforeach; ?>
-</ul>
-<script type="text/javascript">/* <![CDATA[ */ location.hash='errors'; /* ]]> */</script>
-<?php endif; ?>
-
-<?php if(isset($preview) && empty($errors)): ?>
-<p id="preview" class="comment-preview-hl"><?php echo $lang['comment_preview_hl']; ?></p>
-<div class="comment-preview">
-<p class="author"><?php if(isset($preview['hp'])): ?><a href="<?php echo $preview['hp']; ?>"><strong><?php echo $preview['name']; ?></strong></a><?php elseif(isset($preview['email'])): ?><a href="mailto:<?php echo $preview['email']; ?>"><strong><?php echo $preview['name']; ?></strong></a><?php else: ?><strong><?php echo $preview['name']; ?></strong><?php endif; ?>, <?php echo $lang['comment_time']['preview']; ?>:</p>
-<p class="text"><?php echo $preview['comment_text']; ?></p>
-</div>
-<script type="text/javascript">/* <![CDATA[ */ location.hash='preview'; /* ]]> */</script>
-<?php endif; ?>
+                <p class="text"><?php echo $comment['comment']; ?></p>
+                <?php if ($admin): ?>
+                    <p class="admin">
+                        <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,edit,<?php echo $comment['id']; ?>,<?php echo $current_page; ?>#comments"><img
+                                src="<?php echo BASE_URL; ?>templates/images/edit_link.png" width="15" height="10"
+                                alt=""/><?php echo $lang['comment_edit_link']; ?></a> &nbsp;
+                        <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,delete,<?php echo $comment['id']; ?>,<?php echo $current_page; ?>#comments"
+                            onclick="return confirm_link('<?php echo rawurlencode($lang['comment_delete_confirm']); ?>',this,1)">
+                            <img src="<?php echo BASE_URL; ?>templates/images/delete_link.png" width="13" height="9"
+                                alt=""/><?php echo $lang['comment_delete_link']; ?></a></p>
+                <?php endif; ?>
+            </div>
+        <?php endforeach ?>
+    <?php else: ?>
+        <p><i><?php echo $lang['comment_no_comments']; ?></i></p>
+    <?php endif; ?>
 
-<form id="commentform" method="post" action="<?php echo $BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1#comments">
-<div>
-<?php if($form_session_data): ?><input type="hidden" name="<?php echo $form_session_data['name']; ?>" value="<?php echo $form_session_data['id']; ?>" /><?php endif; ?>
-<p><label for="comment_text"><strong><?php echo $lang['comment_input_text']; ?></strong></label><br />
-<textarea id="comment_text" name="comment_text" cols="63" rows="10"><?php echo $form_values['comment_text']; ?></textarea></p>
-<p class="userdata"><label for="name"><?php echo $lang['comment_input_name']; ?></label><br />
-<input type="text" id="name" name="name" value="<?php echo $form_values['name']; ?>" size="30" maxlength="30" /></p>
-<p class="userdata"><label for="email_hp"><?php echo $lang['comment_input_email_hp']; ?></label><br />
-<input type="text" id="email_hp" name="email_hp" value="<?php echo $form_values['email_hp']; ?>" size="30" maxlength="100" /> <small><?php echo $lang['comment_note_email']; ?></small></p>
-<p><input name="save" type="submit" value="<?php echo $lang['comment_input_submit']; ?>"<?php if(!$form_session): ?> disabled="disabled"<?php endif; ?> /> <input name="preview" type="submit" value="<?php echo $lang['comment_input_preview']; ?>" /></p>
-</div>
-</form>
-<p id="show_commentform" style="display:none;"><a href="#commentform" onclick="show_comment_form(); return false" class="icon"><img src="<?php echo BASE_URL; ?>templates/images/comment_add.png" alt="" width="16" height="16" /><span><?php echo $lang['comments_add_comment']; ?></span></a></p>
-<?php if(empty($preview) && empty($errors)): ?>
-<script type="text/javascript">/* <![CDATA[ */ hide_comment_form(); /* ]]> */</script>
-<?php endif; ?>
-
-<?php endif; ?>
+    <?php if ($pagination): ?>
+        <p class="pagination"><?php echo $lang['comments_pagination_info']; ?> [
+            <?php if ($pagination['previous']): ?> <a
+                href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1<?php if ($pagination['previous'] > 1): ?>,<?php echo $pagination['previous']; endif; ?>#comments">&laquo;</a> <?php endif; ?>
+            <?php foreach ($pagination['items'] as $item): ?>
+                <?php if (empty($item)): ?> ..<?php elseif ($item == $pagination['current']): ?>
+                    <span class="current"><?php echo $item; ?></span><?php
+                else: ?> <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1<?php if ($item > 1): ?>,<?php echo $item; endif; ?>#comments"><?php echo $item; ?></a><?php endif; ?>
+            <?php endforeach; ?>
+            <?php if ($pagination['next']): ?>
+            <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1,<?php echo $pagination['next']; ?>#comments">&raquo;</a><?php endif; ?>
+            ]</p>
+    <?php endif; ?>
+
+    <?php if ($errors): ?>
+        <p class="caution"><?php echo $lang['error_headline']; ?></p>
+        <ul>
+            <?php foreach ($errors as $error): ?>
+                <li><?php if (isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
+            <?php endforeach; ?>
+        </ul>
+        <script type="text/javascript">/* <![CDATA[ */
+            location.hash = 'errors';
+            /* ]]> */</script>
+    <?php endif; ?>
+
+    <?php if (isset($preview) && empty($errors)): ?>
+        <p id="preview" class="comment-preview-hl"><?php echo $lang['comment_preview_hl']; ?></p>
+        <div class="comment-preview">
+            <p class="author"><?php if (isset($preview['hp'])): ?><a href="<?php echo $preview['hp']; ?>">
+                    <strong><?php echo $preview['name']; ?></strong></a><?php elseif (isset($preview['email'])): ?>
+                <a href="mailto:<?php echo $preview['email']; ?>"><strong><?php echo $preview['name']; ?></strong>
+                    </a><?php
+                else: ?><strong><?php echo $preview['name']; ?></strong><?php endif; ?>
+                , <?php echo $lang['comment_time']['preview']; ?>:</p>
+
+            <p class="text"><?php echo $preview['comment_text']; ?></p>
+        </div>
+        <script type="text/javascript">/* <![CDATA[ */
+            location.hash = 'preview';
+            /* ]]> */</script>
+    <?php endif; ?>
+
+    <form id="commentform" method="post"
+          action="<?php echo $BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1#comments">
+        <div>
+            <?php if ($form_session_data): ?><input type="hidden" name="<?php echo $form_session_data['name']; ?>"
+                                                    value="<?php echo $form_session_data['id']; ?>" /><?php endif; ?>
+            <p><label for="comment_text"><strong><?php echo $lang['comment_input_text']; ?></strong></label><br/>
+                <textarea id="comment_text" name="comment_text" cols="63"
+                          rows="10"><?php echo $form_values['comment_text']; ?></textarea></p>
+
+            <p class="userdata"><label for="name"><?php echo $lang['comment_input_name']; ?></label><br/>
+                <input type="text" id="name" name="name" value="<?php echo $form_values['name']; ?>" size="30"
+                       maxlength="30"/></p>
+
+            <p class="userdata"><label for="email_hp"><?php echo $lang['comment_input_email_hp']; ?></label><br/>
+                <input type="text" id="email_hp" name="email_hp" value="<?php echo $form_values['email_hp']; ?>"
+                       size="30" maxlength="100"/>
+                <small><?php echo $lang['comment_note_email']; ?></small>
+            </p>
+            <p><input name="save" type="submit"
+                      value="<?php echo $lang['comment_input_submit']; ?>"<?php if (!$form_session): ?> disabled="disabled"<?php endif; ?> />
+                <input name="preview" type="submit" value="<?php echo $lang['comment_input_preview']; ?>"/></p>
+        </div>
+    </form>
+    <p id="show_commentform" style="display:none;"><a href="#commentform" onclick="show_comment_form(); return false"
+                                                      class="icon"><img
+                src="<?php echo BASE_URL; ?>templates/images/comment_add.png" alt="" width="16"
+                height="16"/><span><?php echo $lang['comments_add_comment']; ?></span></a></p>
+    <?php if (empty($preview) && empty($errors)): ?>
+        <script type="text/javascript">/* <![CDATA[ */
+            hide_comment_form();
+            /* ]]> */</script>
+    <?php endif; ?>
+
+    <?php endif; ?>
 </div>
-
-<p id="commentlink" style="<?php if($show_comments): ?>display:none;<?php else: ?>display:block;<?php endif; ?>"><a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1#comments" title="<?php echo $lang['photo_comment_link_title']; ?>" class="commentlink" onclick="show_comments(); return false"><?php echo $lang['number_of_comments']; ?></a></p>
+
+<p id="commentlink" style="<?php if ($show_comments): ?>display:none;<?php else: ?>display:block;<?php endif; ?>">
+    <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $photo_data['id']; ?>,0,1#comments"
+        title="<?php echo $lang['photo_comment_link_title']; ?>" class="commentlink"
+        onclick="show_comments(); return false"><?php echo $lang['number_of_comments']; ?></a></p>
diff --git a/cms/templates/subtemplates/search.inc.tpl b/cms/templates/subtemplates/search.inc.tpl
index 2300141..0aa30df 100644
--- a/cms/templates/subtemplates/search.inc.tpl
+++ b/cms/templates/subtemplates/search.inc.tpl
@@ -1,34 +1,43 @@
-<form action="<?php echo BASE_URL.PAGE; ?>" method="post">
+<form action="<?php echo BASE_URL . PAGE; ?>" method="post">
 
-<div class="input-group">
-<input class="form-control" type="text" name="q">
-<span class="input-group-btn">
-<button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-search"></span></button>
-</span>
-</div>
+    <div class="input-group">
+        <input class="form-control" type="text" name="q">
+        <span class="input-group-btn">
+        <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-search"></span></button>
+        </span>
+    </div>
 </form>
 
-<?php if(isset($results)): ?>
-<p style="margin-top:20px;"><strong><?php echo $lang['search_number_of_results']; ?></strong>
+<?php if (isset($results)): ?>
+    <p style="margin-top:20px;"><strong><?php echo $lang['search_number_of_results']; ?></strong>
 
-<ul id="search">
-<?php foreach($results as $result): ?>
-<li><a href="<?php echo BASE_URL.$result['page']; ?>"><?php echo $result['title']; ?></a><?php if($result['type']==1): ?> <span class="smallx">- <?php echo $lang['search_photo']; ?></span><?php endif; ?><?php if($result['description']): ?> <span class="smallx">- <?php echo $result['description']; ?></span><?php endif; ?></li>
-<?php endforeach; ?>
-</ul>
+    <ul id="search">
+        <?php foreach ($results as $result): ?>
+            <li>
+                <a href="<?php echo BASE_URL . $result['page']; ?>"><?php echo $result['title']; ?></a><?php if ($result['type'] == 1): ?>
+                    <span class="smallx">
+                    - <?php echo $lang['search_photo']; ?></span><?php endif; ?><?php if ($result['description']): ?>
+                    <span class="smallx">- <?php echo $result['description']; ?></span><?php endif; ?></li>
+        <?php endforeach; ?>
+    </ul>
 
-<?php if($pagination): ?>
-<p class="pagination"><?php echo $lang['pagination']; ?> [ 
-<?php if($pagination['previous']): ?> <a href="<?php echo BASE_URL . PAGE; ?>,,<?php echo $q_encoded; if($pagination['previous']>1): ?>,<?php echo $pagination['previous']; endif; ?>">&laquo;</a> <?php endif; ?>
-<?php foreach($pagination['items'] as $item): ?>
-<?php if(empty($item)): ?> ..<?php elseif($item==$pagination['current']): ?> <span class="current"><?php echo $item; ?></span><?php else: ?> <a href="<?php echo BASE_URL . PAGE; ?>,,<?php echo $q_encoded; if($item>1): ?>,<?php echo $item; endif; ?>"><?php echo $item; ?></a><?php endif; ?>
-<?php endforeach; ?>
-<?php if($pagination['next']): ?> <a href="<?php echo BASE_URL . PAGE; ?>,,<?php echo $q_encoded; ?>,<?php echo $pagination['next']; ?>">&raquo;</a><?php endif; ?>  
-]</p>
-<?php endif; ?>
+    <?php if ($pagination): ?>
+        <p class="pagination"><?php echo $lang['pagination']; ?> [
+            <?php if ($pagination['previous']): ?> <a href="<?php echo BASE_URL . PAGE; ?>,,<?php echo $q_encoded;
+            if ($pagination['previous'] > 1): ?>,<?php echo $pagination['previous']; endif; ?>">&laquo;</a> <?php endif; ?>
+            <?php foreach ($pagination['items'] as $item): ?>
+                <?php if (empty($item)): ?> ..<?php elseif ($item == $pagination['current']): ?>
+                    <span class="current"><?php echo $item; ?></span><?php
+                else: ?> <a href="<?php echo BASE_URL . PAGE; ?>,,<?php echo $q_encoded;
+                if ($item > 1): ?>,<?php echo $item; endif; ?>"><?php echo $item; ?></a><?php endif; ?>
+            <?php endforeach; ?>
+            <?php if ($pagination['next']): ?>
+            <a href="<?php echo BASE_URL . PAGE; ?>,,<?php echo $q_encoded; ?>,<?php echo $pagination['next']; ?>">&raquo;</a><?php endif; ?>
+            ]</p>
+    <?php endif; ?>
 
 <?php endif; ?>
 
-<?php if(isset($q) && empty($results)): ?>
-<p><em><?php echo $lang['search_no_results']; ?></em></p>
+<?php if (isset($q) && empty($results)): ?>
+    <p><em><?php echo $lang['search_no_results']; ?></em></p>
 <?php endif; ?>
diff --git a/cms/templates/subtemplates/simple_news.inc.tpl b/cms/templates/subtemplates/simple_news.inc.tpl
index ed29445..6d7582a 100644
--- a/cms/templates/subtemplates/simple_news.inc.tpl
+++ b/cms/templates/subtemplates/simple_news.inc.tpl
@@ -1,135 +1,180 @@
-<?php if(isset($edit_news)): ?>
-
-<?php if(isset($errors)): ?>
-<div class="alert alert-danger">
-<button type="button" class="close" data-dismiss="alert">&times;</button>
-<h3><span class="glyphicon glyphicon-warning-sign"></span> <strong><?php echo $lang['error_headline']; ?></strong></h3>
-<ul class="errors">
-<?php foreach($errors as $error): ?>
-<li><?php if(isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
-<?php endforeach; ?>
-</ul>
-</div>
-<?php endif; ?>
-
-<form class="form-horizontal" action="<?php echo BASE_URL . PAGE; ?>" method="post">
-<div>
-<input type="hidden" name="mode" value="news" />
-<input type="hidden" name="edit_news_submit" value="true" />
-<?php if(isset($edit_news['id'])): ?>
-<input type="hidden" name="id" value="<?php echo $edit_news['id']; ?>" />
-<?php endif; ?>
-  
-<div class="form-group">
-<label for="title" class="col-md-2 control-label"><?php echo $lang['simple_news_edit_title']; ?></label>
-<div class="col-md-10">
-<input id="title" class="form-control" type="text" name="title" value="<?php if(isset($edit_news['title'])) echo $edit_news['title']; ?>">
-</div>
-</div>
-
-<div class="form-group">
-<label for="teaser" class="col-md-2 control-label"><?php echo $lang['simple_news_edit_teaser']; ?></label>
-<div class="col-md-10">
-<textarea id="teaser" class="form-control" name="teaser" rows="5"><?php if(isset($edit_news['teaser'])) echo $edit_news['teaser']; ?></textarea>
-</div>
-</div>
-
-<div class="form-group">
-<label for="text" class="col-md-2 control-label"><?php echo $lang['simple_news_edit_text']; ?></label>
-<div class="col-md-10">
-<textarea id="text" class="form-control" name="text" rows="10"><?php if(isset($edit_news['text'])) echo $edit_news['text']; ?></textarea>
-</div>
-</div> 
-
-<div class="form-group">
-<label for="linkname" class="col-md-2 control-label"><?php echo $lang['simple_news_edit_linkname']; ?></label>
-<div class="col-md-10">
-<input id="linkname" class="form-control" type="text" name="linkname" value="<?php if(isset($edit_news['linkname'])) echo $edit_news['linkname']; ?>">
-</div>
-</div>
-
-<div class="form-group">
-<label for="newstime" class="col-md-2 control-label"><?php echo $lang['simple_news_edit_time']; ?></label>
-<div class="col-md-10">
-<input id="newstime" class="form-control" type="text" name="newstime" value="<?php if(isset($edit_news['time'])) echo $edit_news['time']; ?>" placeholder="<?php echo $lang['simple_news_edit_time_format']; ?>">
-</div>
-</div>
-
-<div class="form-group">
-<div class="col-md-offset-2 col-md-10">
-<button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
-</div>
-</div>
-
-</div>
-</form>
-
-<?php elseif(isset($delete_news)): ?>
-
-<p><strong><?php echo $delete_news['title']; ?></strong></p>
-
-<form action="<?php echo BASE_URL . PAGE; ?>" method="post">
-<div>
-<input type="hidden" name="delete" value="<?php echo $delete_news['id']; ?>" />
-<p><input class="btn btn-danger btn-lg" type="submit" name="confirmed" value="<?php echo $lang['delete_news_confirm_submit']; ?>" /></p>
-</div>
-</form>
-
-<?php elseif(isset($news_item)): ?>
-
-<?php echo $news_item['text']; ?>
-
-<?php if($authorized_to_edit): ?>
-<p>
-<a class="btn btn-primary btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>,edit" title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
-<a class="btn btn-danger btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>,delete" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['simple_news_delete_confirm']); ?>"><span class="glyphicon glyphicon-remove"></span></a>
-</p>
-<?php endif; ?>
-
-<?php elseif(isset($news)): ?>
-
-<?php if($authorized_to_edit): ?>
-<p><a class="btn btn-success" href="<?php echo BASE_URL . PAGE; ?>,add_item"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['simple_news_add_item']; ?></a></p>
-<?php endif; ?>
-
-<?php foreach($news as $news_item): ?>
-<div class="panel panel-default simple-news">
-<div class="panel-heading"><?php echo $lang['simple_news_time'][$news_item['id']]; ?>
-<?php if($authorized_to_edit): ?>
-<span class="pull-right">
-<a class="btn btn-primary btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>,edit" title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
-<a class="btn btn-danger btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>,delete" title="<?php echo $lang['delete']; ?>" data-delete-confirm="<?php echo rawurlencode($lang['simple_news_delete_confirm']); ?>"><span class="glyphicon glyphicon-remove"></span></a>
-</span>
-<?php endif; ?>
-</div>
-<div class="panel-body">
-<h2><a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>"><?php echo $news_item['title']; ?></a></h2>
-<?php if(empty($news_item['teaser'])): ?>
-<?php echo $news_item['text']; ?>
-<?php else: ?>
-<p><?php echo $news_item['teaser']; ?></p>
-<p><a class="btn btn-primary" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>"><?php echo $news_item['linkname']; ?></a></p>
-<?php endif; ?>
-</div>
-</div>
-<?php endforeach; ?>
-
-<?php if($pagination): ?>
-<ul class="pagination">
-<?php if($pagination['previous']): ?><li><a href="<?php echo BASE_URL . PAGE; if($pagination['previous']>1): ?>,,<?php echo $pagination['previous']; endif; ?>"><span class="glyphicon glyphicon-chevron-left"></span></a></li><?php endif; ?>
-<?php foreach($pagination['items'] as $item): ?>
-<?php if(empty($item)): ?><li><span>&hellip;</span></li><?php elseif($item==$pagination['current']): ?><li class="active"><span><?php echo $item; ?></span></li><?php else: ?><li><a href="<?php echo BASE_URL . PAGE; if($item>1): ?>,,<?php echo $item; endif; ?>"><?php echo $item; ?></a></li><?php endif; ?>
-<?php endforeach; ?>
-<?php if($pagination['next']): ?><li><a href="<?php echo BASE_URL . PAGE; ?>,,<?php echo $pagination['next']; ?>"><span class="glyphicon glyphicon-chevron-right"></span></a></li><?php endif; ?>
-</ul>
-<?php endif; ?>
-
-<?php else: ?>
-
-<div class="alert alert-warning"><?php echo $lang['no_news']; ?></div>
-
-<?php if($authorized_to_edit): ?>
-<p><a class="btn btn-success" href="<?php echo BASE_URL . PAGE; ?>,add_item"><span class="glyphicon glyphicon-plus"></span> <?php echo $lang['simple_news_add_item']; ?></a></p>
-<?php endif; ?>
+<?php if (isset($edit_news)): ?>
+
+    <?php if (isset($errors)): ?>
+        <div class="alert alert-danger">
+            <button type="button" class="close" data-dismiss="alert">&times;</button>
+            <h3><span class="glyphicon glyphicon-warning-sign"></span>
+                <strong><?php echo $lang['error_headline']; ?></strong></h3>
+            <ul class="errors">
+                <?php foreach ($errors as $error): ?>
+                    <li><?php if (isset($lang[$error])) echo $lang[$error]; else echo $error; ?></li>
+                <?php endforeach; ?>
+            </ul>
+        </div>
+    <?php endif; ?>
+
+    <form class="form-horizontal" action="<?php echo BASE_URL . PAGE; ?>" method="post">
+        <div>
+            <input type="hidden" name="mode" value="news"/>
+            <input type="hidden" name="edit_news_submit" value="true"/>
+            <?php if (isset($edit_news['id'])): ?>
+                <input type="hidden" name="id" value="<?php echo $edit_news['id']; ?>"/>
+            <?php endif; ?>
+
+            <div class="form-group">
+                <label for="title" class="col-md-2 control-label"><?php echo $lang['simple_news_edit_title']; ?></label>
+
+                <div class="col-md-10">
+                    <input id="title" class="form-control" type="text" name="title"
+                           value="<?php if (isset($edit_news['title'])) echo $edit_news['title']; ?>">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="teaser"
+                       class="col-md-2 control-label"><?php echo $lang['simple_news_edit_teaser']; ?></label>
+
+                <div class="col-md-10">
+                    <textarea id="teaser" class="form-control" name="teaser"
+                              rows="5"><?php if (isset($edit_news['teaser'])) echo $edit_news['teaser']; ?></textarea>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="text" class="col-md-2 control-label"><?php echo $lang['simple_news_edit_text']; ?></label>
+
+                <div class="col-md-10">
+                    <textarea id="text" class="form-control" name="text"
+                              rows="10"><?php if (isset($edit_news['text'])) echo $edit_news['text']; ?></textarea>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="linkname"
+                       class="col-md-2 control-label"><?php echo $lang['simple_news_edit_linkname']; ?></label>
+
+                <div class="col-md-10">
+                    <input id="linkname" class="form-control" type="text" name="linkname"
+                           value="<?php if (isset($edit_news['linkname'])) echo $edit_news['linkname']; ?>">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="newstime"
+                       class="col-md-2 control-label"><?php echo $lang['simple_news_edit_time']; ?></label>
+
+                <div class="col-md-10">
+                    <input id="newstime" class="form-control" type="text" name="newstime"
+                           value="<?php if (isset($edit_news['time'])) echo $edit_news['time']; ?>"
+                           placeholder="<?php echo $lang['simple_news_edit_time_format']; ?>">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-offset-2 col-md-10">
+                    <button class="btn btn-primary" type="submit"><?php echo $lang['submit_button_ok']; ?></button>
+                </div>
+            </div>
+
+        </div>
+    </form>
+
+<?php elseif (isset($delete_news)): ?>
+
+    <p><strong><?php echo $delete_news['title']; ?></strong></p>
+
+    <form action="<?php echo BASE_URL . PAGE; ?>" method="post">
+        <div>
+            <input type="hidden" name="delete" value="<?php echo $delete_news['id']; ?>"/>
+
+            <p><input class="btn btn-danger btn-lg" type="submit" name="confirmed"
+                      value="<?php echo $lang['delete_news_confirm_submit']; ?>"/></p>
+        </div>
+    </form>
+
+<?php
+elseif (isset($news_item)): ?>
+
+    <?php echo $news_item['text']; ?>
+
+    <?php if ($authorized_to_edit): ?>
+        <p>
+            <a class="btn btn-primary btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>,edit"
+               title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
+            <a class="btn btn-danger btn-xs"
+               href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>,delete"
+               title="<?php echo $lang['delete']; ?>"
+               data-delete-confirm="<?php echo rawurlencode($lang['simple_news_delete_confirm']); ?>">
+                <span class="glyphicon glyphicon-remove"></span></a>
+        </p>
+    <?php endif; ?>
+
+<?php
+elseif (isset($news)): ?>
+
+    <?php if ($authorized_to_edit): ?>
+        <p><a class="btn btn-success" href="<?php echo BASE_URL . PAGE; ?>,add_item"><span
+                    class="glyphicon glyphicon-plus"></span> <?php echo $lang['simple_news_add_item']; ?></a></p>
+    <?php endif; ?>
+
+    <?php foreach ($news as $news_item): ?>
+        <div class="panel panel-default simple-news">
+            <div class="panel-heading"><?php echo $lang['simple_news_time'][$news_item['id']]; ?>
+                <?php if ($authorized_to_edit): ?>
+                    <span class="pull-right">
+                    <a class="btn btn-primary btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>,edit"
+                       title="<?php echo $lang['edit']; ?>"><span class="glyphicon glyphicon-pencil"></span></a>
+                    <a class="btn btn-danger btn-xs" href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>,delete"
+                       title="<?php echo $lang['delete']; ?>"
+                       data-delete-confirm="<?php echo rawurlencode($lang['simple_news_delete_confirm']); ?>"><span
+                            class="glyphicon glyphicon-remove"></span></a>
+                    </span>
+                <?php endif; ?>
+            </div>
+            <div class="panel-body">
+                <h2>
+                    <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>"><?php echo $news_item['title']; ?></a>
+                </h2>
+                <?php if (empty($news_item['teaser'])): ?>
+                    <?php echo $news_item['text']; ?>
+                <?php else: ?>
+                    <p><?php echo $news_item['teaser']; ?></p>
+                    <p><a class="btn btn-primary"
+                          href="<?php echo BASE_URL . PAGE; ?>,<?php echo $news_item['id']; ?>"><?php echo $news_item['linkname']; ?></a>
+                    </p>
+                <?php endif; ?>
+            </div>
+        </div>
+    <?php endforeach; ?>
+
+    <?php if ($pagination): ?>
+        <ul class="pagination">
+            <?php if ($pagination['previous']): ?>
+                <li><a href="<?php echo BASE_URL . PAGE;
+                if ($pagination['previous'] > 1): ?>,,<?php echo $pagination['previous']; endif; ?>">
+                    <span  class="glyphicon glyphicon-chevron-left"></span></a></li><?php endif; ?>
+            <?php foreach ($pagination['items'] as $item): ?>
+                <?php if (empty($item)): ?>
+                    <li><span>&hellip;</span></li><?php elseif ($item == $pagination['current']): ?>
+                    <li class="active"><span><?php echo $item; ?></span></li><?php
+                else: ?>
+                    <li><a href="<?php echo BASE_URL . PAGE;
+                    if ($item > 1): ?>,,<?php echo $item; endif; ?>"><?php echo $item; ?></a></li><?php endif; ?>
+            <?php endforeach; ?>
+            <?php if ($pagination['next']): ?>
+                <li><a href="<?php echo BASE_URL . PAGE; ?>,,<?php echo $pagination['next']; ?>">
+                    <span class="glyphicon glyphicon-chevron-right"></span></a></li><?php endif; ?>
+        </ul>
+    <?php endif; ?>
+
+<?php
+else: ?>
+
+    <div class="alert alert-warning"><?php echo $lang['no_news']; ?></div>
+
+    <?php if ($authorized_to_edit): ?>
+        <p><a class="btn btn-success" href="<?php echo BASE_URL . PAGE; ?>,add_item">
+                <span class="glyphicon glyphicon-plus"></span> <?php echo $lang['simple_news_add_item']; ?></a></p>
+    <?php endif; ?>
 
 <?php endif; ?>
diff --git a/cms/templates/subtemplates/thumbnail.inc.tpl b/cms/templates/subtemplates/thumbnail.inc.tpl
index 4e4167c..5122ca0 100644
--- a/cms/templates/subtemplates/thumbnail.inc.tpl
+++ b/cms/templates/subtemplates/thumbnail.inc.tpl
@@ -1,9 +1,19 @@
-<?php if(isset($thumbnail)): ?>
-<?php if($settings['lightbox_enabled']): ?>
-<a <?php if(isset($thumbnail['class'])): ?> class="<?php echo $thumbnail['class']; ?>"<?php endif; ?> href="<?php echo BASE_URL.MEDIA_DIR.$thumbnail['photo']; ?>" data-lightbox><img src="<?php echo BASE_URL.MEDIA_DIR.$thumbnail['image']; ?>" title="<?php echo $thumbnail['title']; ?>" alt="<?php echo $thumbnail['title']; ?>" data-subtitle="<?php echo $thumbnail['subtitle']; ?>" data-description="<?php echo $thumbnail['description']; ?>" width="<?php echo $thumbnail['width']; ?>" height="<?php echo $thumbnail['height']; ?>" /></a>
+<?php if (isset($thumbnail)): ?>
+    <?php if ($settings['lightbox_enabled']): ?>
+        <a <?php if (isset($thumbnail['class'])): ?> class="<?php echo $thumbnail['class']; ?>"<?php endif; ?>
+            href="<?php echo BASE_URL . MEDIA_DIR . $thumbnail['photo']; ?>" data-lightbox>
+            <img  src="<?php echo BASE_URL . MEDIA_DIR . $thumbnail['image']; ?>"
+                title="<?php echo $thumbnail['title']; ?>" alt="<?php echo $thumbnail['title']; ?>"
+                data-subtitle="<?php echo $thumbnail['subtitle']; ?>"
+                data-description="<?php echo $thumbnail['description']; ?>" width="<?php echo $thumbnail['width']; ?>"
+                height="<?php echo $thumbnail['height']; ?>"/></a>
+    <?php else: ?>
+        <a<?php if (isset($thumbnail['class'])): ?> class="<?php echo $thumbnail['class']; ?>"<?php endif; ?>
+            href="<?php echo BASE_URL . PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $thumbnail['id']; ?>">
+            <img src="<?php echo BASE_URL . MEDIA_DIR . $thumbnail['image']; ?>"
+                title="<?php echo $thumbnail['title']; ?>" alt="<?php echo $thumbnail['title']; ?>"
+                width="<?php echo $thumbnail['width']; ?>" height="<?php echo $thumbnail['height']; ?>"/></a>
+    <?php endif; ?>
 <?php else: ?>
-<a<?php if(isset($thumbnail['class'])): ?> class="<?php echo $thumbnail['class']; ?>"<?php endif; ?> href="<?php echo BASE_URL.PAGE; ?>,<?php echo IMAGE_IDENTIFIER; ?>,<?php echo $thumbnail['id']; ?>"><img src="<?php echo BASE_URL.MEDIA_DIR.$thumbnail['image']; ?>" title="<?php echo $thumbnail['title']; ?>" alt="<?php echo $thumbnail['title']; ?>" width="<?php echo $thumbnail['width']; ?>" height="<?php echo $thumbnail['height']; ?>" /></a>
-<?php endif; ?>
-<?php else: ?>
-<span class="missing">[ missing image ]</span>
+    <span class="missing">[ missing image ]</span>
 <?php endif; ?>
