Merge navbar Alex's changes into master