Fixed some issues with the menu