Make routes a bit simpler. 

* Fixed forms so they all work the same