Sprint 44 UI fixes

This PR should fix: 
* #8958
* #9183 
* #9204 
* #9163