fix issues with menu