updated model to match Geofences
added form to templates
updates