Reorganized navbar to collapse cleaner.