More work in the layout design and the navigation