Major rework on UI.