Migrate email forms to app2 layout
Cleaned up enumerations of application2 layout in controllers