Changes to navbar and format