Tweak the target picker to blend in better
tweak the shape and animation for the target picker
base the identifier on name instead of target ID

This will allow you to change the target without losing old mnemonics.