updated navigation and layout