reorganizing menu and pages
reorganizing menu and pages
reorganizing menu and pages
reorganizing menu and pages.  This and previous few commits apply to #39