Minor changes - keybindings and menu