Added back proper calls to menu buttons