URLs for forms x2, moved code in view & tests…

and new URL