Fixing navbar logic again