Further UI rework