Minor changes to output layout