Also add bindings for eshell
Fix switch-window binding