Phase 1 of changes to UI
Phase 2 new UI
Fixed handling of wait and stop signal