Added swap-window commands