Small tweaks to navbar
resolving merge conflict