Adjusted how the data is structured for both HTML and JSON.