Put columns in correct order