modify according to redesigning of AdaptiveCellEdge and AdaptiveCell