Updates to support customization of the <select> and <option>s