Improvements to navbar