Adjust markup for buttons to avoid Yahoo Mail issue