I-108147 - cosmetic ui updates