Some form changes which are not commited
Merge branch 'forms'
Fix the controller to action to follow the ADR