Use consistent naming
Add form validation and adjust form layout
Rename landing pages again
Fix form mappings