Updated care layout and legend