The prior fix for issue 653 broke the updateColumnHeader function by changing the order of the nodes in the column header. This fix restores the correct order and changes the CSS of the sort indicator to make it appear on the right side of the column header.