Redesigned menus for ease of use - close to finished