Temp fix for navbar issues