Tweaked layout on the single ot be tighter