Change order of fields and remove serial column in machine main view