Moved keymapping from logic to UI. This keeps the logic cleaner
Merge interface changes from master. Still nothing works