Add the changes from the mid-sprint discussion with improved
layout and labeling.