Address David's high-level UI concerns
First pass after David's comments