More cleanup and rewriting of navigation and home page