Tweaked layout a bit