Fixed some navbar issues