Ui update gone further, structural improvement