Fixed navigation bar layout issues