updated routes and form