Made some fixes to navbar