Updated news and events to json feeds and updated map to new model