diff --git a/app/Handlers/BaseHandler.php b/app/Handlers/BaseHandler.php
index 49c06eee..9f6caf8b 100644
--- a/app/Handlers/BaseHandler.php
+++ b/app/Handlers/BaseHandler.php
@@ -69,30 +69,36 @@ abstract class BaseHandler implements BaseModuleHandler
                 }, 50, ['icon' => 'fa fa-fw fa-object-group']);
             }, 50, ['icon' => 'fa fa-fw fa-puzzle-piece']);
 
-            /**
-             * Templates
-             */
-            $templatePaths = TemplatePathsHumanReadableRootOnly::getWithTranslations();
-            if (!empty($templatePaths)) {
-                $menu->dropdown(trans('admin/mainMenu.templates'), function ($sub) use ($templatePaths) {
-                    $i = 1;
-                    foreach ($templatePaths as $id => $name) {
-                        $sub->route('templates.overview', $name, ['id' => $id], $i++);
-                    }
-                }, 60, ['icon' => 'fa fa-fw fa-file-code-o']);
-            }
-
             /**
              * Divide system entries and other links in menu
              */
             $menu->addDivider(9999);
 
             $menu->dropdown(trans('admin/mainMenu.system'), function ($sub) {
+
+                /**
+                 * User management
+                 */
                 $sub->dropdown(trans('admin/mainMenu.userManagement'), function ($sub) {
                     $sub->route('users.new', trans('admin/mainMenu.newUser'), [], 10, ['icon' => 'fa fa-fw fa-user-plus']);
                     $sub->route('users.overview', trans('admin/mainMenu.usersOverview'), [], 30, ['icon' => 'fa fa-fw fa-users']);
                 }, 20, ['icon' => 'fa fa-fw fa-users']);
 
+                /**
+                 * Templates
+                 */
+                $templatePaths = TemplatePathsHumanReadableRootOnly::getWithTranslations();
+                if (!empty($templatePaths)) {
+                    $sub->dropdown(trans('admin/mainMenu.templates'), function ($sub) use ($templatePaths) {
+                        $i = 1;
+                        foreach ($templatePaths as $id => $name) {
+                            $sub->route('templates.overview', $name, ['id' => $id], $i++);
+                        }
+                    }, 60, ['icon' => 'fa fa-fw fa-file-code-o']);
+                }
+
+
+
                 //            $menu->dropdown(trans('admin/mainMenu.customFields'), function ($sub) {
                 //                $sub->route('customfields.new', trans('admin/mainMenu.customFieldsNew'), [], 10, ['icon' => 'fa fa-fw fa-code']);
                 //                $sub->route('customfields.overview', trans('admin/mainMenu.customFieldsOverview'), [], 50, ['icon' => 'fa fa-fw fa-code-fork']);
@@ -100,7 +106,7 @@ abstract class BaseHandler implements BaseModuleHandler
 
                 $sub->route('log.overview', trans('admin/mainMenu.actionLog'), [], 70, ['icon' => 'fa fa-fw fa-history']);
                 $sub->route('settings.overview', trans('admin/mainMenu.settings'), [], 80, ['icon' => 'fa fa-fw fa-gear']);
-            }, 10000, ['icon' => 'fa fa-fw fa-gear']);
+            }, 10000, ['icon' => 'fa fa-fw fa-gears']);
 
 
         });
diff --git a/resources/lang/cs/common.php b/resources/lang/cs/common.php
index 979e09e0..c6731744 100644
--- a/resources/lang/cs/common.php
+++ b/resources/lang/cs/common.php
@@ -1,6 +1,14 @@
 <?php
 return [
-"lang" => ["czech" => "Čeština",
-"english" => "Angličtina",
-],
+    "customize"      => "Přispůsobení",
+    "footer"         => "Zápatí",
+    "header"         => "Záhlaví",
+    "lang"           => [
+        "czech"   => "Čeština",
+        "english" => "Angličtina",
+    ],
+    "positionFixed"  => "fixní",
+    "positionStatic" => "statické",
+    "sidebar"        => "Sidebar",
+    'goToWeb'        => 'Jít na web'
 ];
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index df0cb8ab..8630a04a 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -1,7 +1,14 @@
 <?php
 return [
-    'lang' => [
+    'lang'           => [
         'english' => 'English',
         'czech'   => 'Czech'
-    ]
+    ],
+    'customize'      => 'Customize',
+    'header'         => 'Header',
+    'sidebar'        => 'Sidebar',
+    'footer'         => 'Footer',
+    'positionFixed'  => 'fixed',
+    'positionStatic' => 'static',
+    'goToWeb' => 'View website'
 ];
\ No newline at end of file
diff --git a/resources/views/admin/layoutWithNavigation.blade.php b/resources/views/admin/layoutWithNavigation.blade.php
index d46663f6..8c3900b2 100644
--- a/resources/views/admin/layoutWithNavigation.blade.php
+++ b/resources/views/admin/layoutWithNavigation.blade.php
@@ -38,6 +38,11 @@
                                 @endforeach
                             </div>
 
+                        <li class="profile">
+                            <a href="{{route('page.index')}}" target="_blank" class="nav-link" data-toggle="tooltip" data-placement="bottom" title="@lang('common.goToWeb')"><i class="fa fa-fw fa-globe"></i></a>
+                        </li>
+
+
                         <li class="profile dropdown">
                             <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button"
                                aria-haspopup="true" aria-expanded="false">
@@ -59,7 +64,7 @@
                                 <span class="l l1"></span> <span class="l l2"></span> <span
                                         class="l l3"></span> <span class="l l4"></span> <span class="l l5"></span>
                             </div>
-                            {{isset($pageName) ? $pageName : ''}}
+                            {{isset($pageName) ? str_limit($pageName, 15) : ''}}
                         </div>
                     </div>
                     <nav class="menu">
@@ -74,11 +79,11 @@
                                     <div class="customize-item">
                                         <div class="row customize-header">
                                             <div class="col-xs-4"></div>
-                                            <div class="col-xs-4"><label class="title">fixed</label></div>
-                                            <div class="col-xs-4"><label class="title">static</label></div>
+                                            <div class="col-xs-4"><label class="title">@lang('common.positionFixed')</label></div>
+                                            <div class="col-xs-4"><label class="title">@lang('common.positionStatic')</label></div>
                                         </div>
                                         <div class="row hidden-md-down">
-                                            <div class="col-xs-4"><label class="title">Sidebar:</label></div>
+                                            <div class="col-xs-4"><label class="title">@lang('common.sidebar')</label></div>
                                             <div class="col-xs-4"><label>
                                                     <input class="radio" type="radio" name="sidebarPosition"
                                                            value="sidebar-fixed">
@@ -90,7 +95,7 @@
                                                 </label></div>
                                         </div>
                                         <div class="row">
-                                            <div class="col-xs-4"><label class="title">Header:</label></div>
+                                            <div class="col-xs-4"><label class="title">@lang('common.header')</label></div>
                                             <div class="col-xs-4"><label>
                                                     <input class="radio" type="radio" name="headerPosition"
                                                            value="header-fixed">
@@ -102,7 +107,7 @@
                                                 </label></div>
                                         </div>
                                         <div class="row">
-                                            <div class="col-xs-4"><label class="title">Footer:</label></div>
+                                            <div class="col-xs-4"><label class="title">@lang('common.footer')</label></div>
                                             <div class="col-xs-4"><label>
                                                     <input class="radio" type="radio" name="footerPosition"
                                                            value="footer-fixed">
@@ -127,7 +132,7 @@
                                     </div>
                                 </li>
                             </ul>
-                            <a href=""> <i class="fa fa-cog"></i> Customize </a>
+                            <a href=""> <i class="fa fa-fw fa-sliders"></i> @lang('common.customize') </a>
                         </li>
                     </ul>
                 </footer>
diff --git a/resources/views/admin/search/results.blade.php b/resources/views/admin/search/results.blade.php
index e35035cc..2862af78 100644
--- a/resources/views/admin/search/results.blade.php
+++ b/resources/views/admin/search/results.blade.php
@@ -1,7 +1,7 @@
 
 @foreach($results as $id => $result)
-    {{--<div class="search-result" id="{{$id}}">--}}
+    <div class="search-result" id="{{$id}}">
         <h4>{{$result['name']}} ({{$result['count']}})</h4>
         {!! $result['content'] !!}
-    {{--</div>--}}
+    </div>
 @endforeach
\ No newline at end of file