Lot's of little tweaks.

Trying to figure out a good system for “layout”. Closes #48.