#2197: Visual improvements to insert buttons
#2197: Redo how selections are handled.