rework of ui