Make button templetes better decriptive - part 2