Most menus are done
* Lot of refactoring