Flattened box headers, softened difference between even/odd form rows
Merge remote-tracking branch 'upstream/master'