Improved OTU mapping UI and flow, cleanup of site nav and menus.

See commit messages for details.