More architectural reworking, added shortcut keys