fixed set cell and added row id