Split messages template into two templates for better legibility. Issue: #370
Fixed a bug where form fields were not being included. Added icon to indicate generated fields. Pulled out services. Added tests. Issue: #370 #579