Tweaks to navbar

Still need to keep tweaking