Working on menu
Simplifying ui