Fix navbar expansion button in match and close customize hotkeys on save