Attept to fix the navigation layout issues