Tweaked layout a bit more