Added templates and googlemap integration