Tweaked layouts a bit