Change order, remove empty date fields