Fixed issues with menu