added order to excel columns + mapped grid column order to excel export + fixes