Merge branch 'MLAB-643' into 'testing'

MLAB-643: fixing UI issues

See merge request !133
1 job for testing in 28 seconds (queued for 3 seconds)