border changes + order changes for scores