Copy and style changes
Merge branch 'dev'

Copy and styling changes