Formatting and label changes per Adrian & Sherri.