Updated data and minor html tweaks