Cleanup
Moved keyboard shortcuts to main window