URLs for forms x 2, moved code in views + tests, new URL