Put the Columns in the Sort order of the Editable Fields

Signed-off-by: Cameron Grant <sasky.creative@gmail.com>