Dc/Melanie |#4119 #4116 #4120| Ui changes