added navigation and table