URLs changed for forms, moved code in views + tests