CLC-909 Pre-MVP design refinements
Addresses most of the new refinements listed at 
https://jira.media.berkeley.edu/jira/browse/CLC-909
Merge pull request #447 from shacker/CLC-909

CLC-909 Pre-MVP design refinements