CLC-909 Pre-MVP design refinements

Addresses most of the new refinements listed at 
https://jira.media.berkeley.edu/jira/browse/CLC-909