Update xmonad configuration -- more layouts and cleanup