Improve mappings for xmonad