Fix some issues with menu