Fix top navbar menu issues