Re-organize structure & clean some useless call + column structure in grid