Fix menu first button handling and button reset handling