add proper data
merge markup changes with proper data
remove underscore; adjust markup to the new patient data
change icon classes