Updated layout with feedback from Lisa.