Solution 1: change the toolbar so that each command can indicate a target

Solution 1: change the toolbar so that each command can indicate a target