Working with more complete dataset

Made changes to the json and now using new fields in the HTML