Fix for navbar issues