Added swap-window bindings N and P