diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index 0b19a1d..3568f33 100644
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -5,6 +5,10 @@
  */
 
 .nav-usertools {
+    &.has-bar{
+        margin-top: @height-context-bar;
+        padding-top: .5rem;
+    }
     ul{
         float: right;
         padding: 0; margin: .2rem 0 0 0;
@@ -67,6 +71,62 @@
                 /* add more icons if needed */
             }
 
+            &.user-task{
+                &.noopentasks{
+                    border: 1px solid @color-border;
+                    border-radius: @border-radius;
+                    color: @color-nav;
+                    display: inline-block;
+                    height: 1rem;
+                    min-height: 20px;
+                    min-width: 24px;
+                    box-sizing: content-box;
+                    padding: .3em .25em .15em;
+                    margin-top: 2px;
+                    position: relative;
+                }
+
+                a{
+                    position: relative;
+                    overflow: visible;
+                    white-space: normal;
+                    text-indent: 0;
+                    &:before{
+                        content: "";
+                        position: absolute;
+                    }
+                }
+
+                .prefix{
+                    .fontello();
+                    .hide-text-show-before();
+                    .icon-clipboard();
+                    color: @color-nav;
+                }
+
+
+
+                .num{
+                    position: absolute;
+                    padding: .2em .3em .1em;
+                    text-align: center;
+                    font-size: .6rem;
+                    line-height: 100%;
+                    font-weight: 400;
+                    right: -0.3em;
+                    top: -0.4em;
+                    background-color: @color-border;
+                    border-radius: 2px;
+                    color: @color-nav;
+                }
+                &.opentasks, &.opentask{
+                    .num{
+                        background-color: @color-link;
+                        color: #fff;
+                    }
+                }
+            }
+
             &.user{
                 border: 1px solid @color-border;
                 border-radius: @border-radius;
diff --git a/css/area_sidebar-search.less b/css/area_sidebar-search.less
index 650d3f3..b1a5b4e 100644
--- a/css/area_sidebar-search.less
+++ b/css/area_sidebar-search.less
@@ -8,10 +8,10 @@
     form{
         white-space: nowrap;
         .no{
+            border: 1px solid ;
             padding-right: 1.5rem;
             #qsearch__in{
                 width: 100%;
-                border: 1px solid green;
             }
         }
     }
diff --git a/css/base.less b/css/base.less
index 1e1c05e..247c83c 100755
--- a/css/base.less
+++ b/css/base.less
@@ -96,7 +96,11 @@
 @color-nav-hover:   __nav_menu_hover_color__;
 @color-nav-hover-bg:__nav_menu_hover_bg__;
 
-    /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+@color-link:        __existing__;
+
+@height-context-bar: 50px;
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* all media */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 html, body{
diff --git a/css/base_structure.less b/css/base_structure.less
index 7a35c79..f33f95f 100755
--- a/css/base_structure.less
+++ b/css/base_structure.less
@@ -69,6 +69,7 @@
 
 @media @screen_min-md {
 
+    // z-indeces
     .nav-direct p{
         z-index: 1000;
     }
@@ -92,21 +93,31 @@
         width: 100%;
     }
 
-    .header .row > .col-xs-12{
-        position: relative;
-        height: 150px;
-        min-height: 6rem;
-        box-sizing: content-box;
+    .header, .tools{
+        .row{
+            position: relative;
+            > .col-xs-12{
+                width: 23%;
+                box-sizing: border-box;
+            }
+        }
     }
+
+    .header{
+        .row > .col-xs-12{
+            position: relative;
+            height: 150px;
+            min-height: 6rem;
+        }
+    }
+
     .tools{
         .row > .col-xs-12{
             position: absolute;
-            width: 23%;
-        }
-        .main-sidebar{
-            //background: pink;
+            background: pink;
         }
     }
+
     .content{
         .row > .col-xs-12{
             width: 73%;
@@ -115,17 +126,13 @@
             background-color: #fff;
         }
     }
-    .claim{
-        width: 23%;
-        box-sizing: content-box;
-        padding-right: (@margin-big / 2);
 
+    .claim{
         .logo{
             position: absolute;
             bottom: 0;
             height: 1px;
             overflow: visible;
-            width: 23%;
         }
         .logo img{
             max-width: 100%;
@@ -141,7 +148,5 @@
             }
         }
     }
-
-
 }
 
diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less
index bad7025..1276b10 100644
--- a/css/plugins/magic-matcher.less
+++ b/css/plugins/magic-matcher.less
@@ -20,10 +20,10 @@
         border-radius: 0 0 __default_border_radius__ __default_border_radius__;
         position: relative;
         z-index: 100;
-        left: .25%;
-        width: 99.5%;
-        min-height: 50px;
+        width: 100%;
+        min-height: @height-context-bar;
         padding: .8em 1em .5em;
+        margin-bottom: 0;
 
         .chosen-container-single .chosen-single span{
             line-height: @line-height-bigger;
diff --git a/main.php b/main.php
index f731fc9..0c7d540 100755
--- a/main.php
+++ b/main.php
@@ -234,18 +234,21 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
 
 
     /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-    /* User Tools */
+    /* User Tools and MagicMatcher Bar */
     /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                            $mm = plugin_load('helper', 'magicmatcher_context');
+                            $navClass = "";
+                            if($mm){
+                                $matcher = $mm->getIssueContextBar();
+                                if($matcher !== ""){
+                                    $navClass = "has-bar";
+                                }
+                            }
+
                             include('tpl/nav-usertools.php');
-
-                            ?>
-
-                            <?php
-    /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-    /* MagicMatcher */
-    /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                            include('tpl/nav-magicmatcher.php');
-
+                            if($mm && $matcher !== ""){
+                                include('tpl/nav-magicmatcher.php');
+                            }
 
     /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
     /* Include Hook: header.html */
diff --git a/tpl/nav-magicmatcher.php b/tpl/nav-magicmatcher.php
index f87fff0..394de12 100644
--- a/tpl/nav-magicmatcher.php
+++ b/tpl/nav-magicmatcher.php
@@ -5,13 +5,10 @@
                             <div id="dokuwiki_magic-matcher" class="magic-matcher no-print">
                                 <div class="container">
                                     <?php
-                                    $mm = plugin_load('helper', 'magicmatcher_context');
-                                    if($mm){
                                         echo "<h6 class=\"sr-only\" role=\"heading\" aria-level=\"2\">".tpl_getLang('head_magic_matcher')."</h6>";
                                         echo PHP_EOL;
-                                        $mm->tpl();
+                                        echo $matcher;
                                         echo PHP_EOL;
-                                    }
                                     ?>
                                 </div><!-- .container -->
                             </div><!-- .magic-matcher -->
diff --git a/tpl/nav-usertools.php b/tpl/nav-usertools.php
index d769377..05400a7 100644
--- a/tpl/nav-usertools.php
+++ b/tpl/nav-usertools.php
@@ -3,7 +3,7 @@
 
     if ($conf['useacl'] && $showTools): ?>
 
-                            <nav id="dokuwiki__usertools" class="nav-usertools">
+                            <nav id="dokuwiki__usertools" class="nav-usertools <?php echo $navClass?>">
                                 <h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['user_tools']; ?></h6>
                                 <ul>
                                     <li class="log"><?php tpl_actionlink('login'); ?></li>
@@ -20,7 +20,9 @@
                                         switch ($num) {
                                             case 0: $class = 'noopentasks'; break;
                                             case 1:  $class = 'opentask'; break;
-                                            default: $class = 'opentasks'; break;
+                                            default:
+                                                $class = 'opentask opentasks';
+                                                break;
                                         }
                                         $linktarget = tpl_getConf('tasks_page');
                                         $doInner = "<span class=\"prefix\">".tpl_getLang('prefix_tasks_user')." </span><span class=\"num\">".count($tasks)."</span>";