Improved care layout w/ forms