moving switch back to right sidebar, keeping keyboard shortcut.
cleanup