update button templates with cleaner code