Fix Target Names Button

Finishing touches