Fixed adding/removing cells