Rework user interface