Added navigation and a layout