HCSVLAB-153: ui fixes for demo