Cleanup xmobar, add battery and xmonad info