Cleanup Targeting consistency across modifiers.
Adding Initial Toolbar panel to allow easier testing with a tablet.