Reorganization and style updates to nav.