Applied fix code from Micheus
Applied new UI items numeration for improve new additions.