Design 3 merge

Improvements to layout, styles, & behaviors. Tests clean.