Lots of route changes, and form updates