Fixed navigation issues in the default layout