CLC-1055 Design refinements round #4
https://jira.media.berkeley.edu/jira/browse/CLC-1055
Merge pull request #545 from christianv/CLC-1055

CLC-1055 Design refinements round #4