updated navigation and views