Improved the menu