Add optional targets to buttons