add day columns to locations and reformat field order