Refactored menus
more style changes