Improved the menu

Working now.