Revert "Appearance tweaks."

This reverts commit 41ccd59d487895a2fd409fa37ab072bbefbcc681.
Revert "nest data in two levels"

This reverts commit 24ccc5fabac814c45f77cb13ac61bd08e35b39dd.
Revert "Revert "nest data in two levels""

This reverts commit 9d71de71823eba197baa625fa5ead20beb7f85f0.
Revert "Revert "Appearance tweaks.""

This reverts commit 1da3291643b810e67e569ac3d014ea8f8f2d4da6.
Probably good merge...