Updated layout for better handling of navbar