updated xmonad.hs: including tabbing within other layouts