More R44 UI fixes

Fixes for:
- #9124 
- #9244