remove what we do not need, add cellMargin, add fake accessoryView for better animation