added navigation and forms