edit: Various design and detail tweaks.
