more work on forms and navs