more changes to navigation and layout