#5729 UI improvements
#5729 UI improvements
Merge pull request #5824 from dotCMS/missing-changes-for-5729

Missing changes for 5729