Fixed up layouts, first stage of xinerama swap complete (added M-m, see keybindings)