Dc/Melanie |#4119 #4118 #4120| UI changes