Tweaked layout slightly