UI fixes

Alicerequested to merge
wip/exalm/undershoot into main

See individual commits.

Merge request reports