Make the navigation 2-layered

Make the navigation 2-layered closes 1