Modified menu for better control