Minor ui fixes
Merge branch 'Service-Statemachine'