Merged with master. New nav bar.