Added groups and finished optgroup