Fix forms and nav buttons