Usability test improvements

[gianfluetsch]

Pull request to merge code changes for improvements according to the usability test

[dkalberer]

Pipeline successful -> merge approved