Menu editing

Finished up some of the main page and top nav issues, working now on
getting the menu to look better.