Tidied up the active menu state.