finished rough outline of menu page
merge changes and finished rough outline of menu page