Re-enabled C-x o mapping to switch-window