Fix for navbar and sidebar