Added sorting and disabled column reordering on the overview table.
Fixed merge conflict