URLs for forms x2 moved code in view + tests, new URL