Initial submission of a new, more consistent design.
Merge branch 'master' into new-style
Removing redundant changes from master merge.