diff --git a/config/yabar/yabar.conf b/config/yabar/yabar.conf
new file mode 100644
index 0000000..3c1345a
--- /dev/null
+++ b/config/yabar/yabar.conf
@@ -0,0 +1,22 @@
+bar-list = ["topbar"];
+topbar:{
+    font: "Droid Sans, FontAwesome Bold 9";
+    block-list: ["date"];
+    position: "top";
+    gap-horizontal: 0;
+    gap-vertical: 0;
+    height: 20;
+    background-color-argb: 0x0;
+    underline-size: 2;
+    oveerline-size: 2;
+    slack-size: 4; // unused space between blocks
+    date:{
+        exec: "date +'%a %d %b, %I:%M'";
+        align: "center";
+        fixed-size: 150;
+        type: "periodic";
+        interval: 1;
+        foreground-color-rgb:0xFFFFFF;
+        underline-color-rgb:0x0;
+    }
+}
diff --git a/xinitrc b/xinitrc
index cd2df57..5242562 100644
--- a/xinitrc
+++ b/xinitrc
@@ -41,6 +41,7 @@ forklog xcape -t 100 -e 'Super_L=Scroll_Lock;Shift_L=Escape'
 forklog sh ~/.fehbg
 forklog xautolock -time 1 -locker xsecurelock
 forklog xset dpms 0 0 50 s off
+forklog yabar
 
 #forklog sxhkd -c ~/.config/sxhkd/sxhkd.conf
 #exec nwm
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index a9a0974..19dfe98 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -17,6 +17,8 @@
 --
 
 import XMonad
+import XMonad.Layout.NoBorders
+import XMonad.Hooks.ManageDocks
 import Graphics.X11.ExtraTypes.XF86
 import Data.Monoid
 import System.Exit
@@ -164,7 +166,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     -- Use this binding with avoidStruts from Hooks.ManageDocks.
     -- See also the statusBar function from Hooks.DynamicLog.
     --
-    -- , ((modm              , xK_b     ), sendMessage ToggleStruts)
+    , ((modm              , xK_b     ), sendMessage ToggleStruts)
 
     -- Quit xmonad
     , ((modm .|. shiftMask, xK_q     ), io (exitWith ExitSuccess))
@@ -246,11 +248,11 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $
 -- The available layouts.  Note that each layout is separated by |||,
 -- which denotes layout choice.
 --
-myLayoutHook = Full ||| tiled
+myLayoutHook = smartBorders $ avoidStruts $ Full ||| tiled
   where
     -- default tiling algorithm partitions the screen into two panes
     tiled = Tall nmaster delta ratio
-    
+
     -- The default number of windows in the master pane
     nmaster = 1
 
@@ -362,8 +364,8 @@ defaults = def {
 
       -- hooks, layouts
         layoutHook         = myLayoutHook,
-        manageHook         = myManageHook,
-        handleEventHook    = myEventHook,
+        manageHook         = myManageHook <+> manageDocks,
+        handleEventHook    = myEventHook <+> docksEventHook,
         logHook            = myLogHook,
         startupHook        = myStartupHook
     }