Solution 1: rearrange the toolbar so that it's noun oriented - first pick the type of target, then the command

Solution 1: rearrange the toolbar so that it’s noun oriented – first pick the type of target, then the command