Supervisor UI rework

.