Tweaked layouts and minor bugfixes.