Fixing navbar issues