Tweaked layout some more