Make multiple design changes following bug bash

Pivotal https://www.pivotaltracker.com/s/projects/911874/stories/62547034

Michael T has seen these and approved.