Custom routes and simple form fixes #5