Fix issue with delete button showing up multiple times for nested ranges.
Fix special case removing the remove button issue.