EG2 complete and change table layout