redesign
Merge branch 'staging'

Proprietor copy restated.