Added swap-windows functionality (M-s)