Fix output layout