Minor tweaks.
Major layout reworking.