More work on the toolbar & selection mode