Fix order of columns in datagrid

While I'm here sort imports