add icon for completed
change column order
pre-final