Adjust margins for navbar and make small navbar style tweaks