Merge branch 'GUI' into hotkeys
Re add hotkeys