Some reordering in spreadsheet and summary