CLC-1055 Design refinements #4
https://jira.media.berkeley.edu/jira/browse/CLC-1055