Changes to UI and the routing. Fixes some forms.