Adding xmobar and cleanup