Many changes in templates, one template for all forms
Google map added to location, not used yet