Fixes shortcut and menu, version 0.3