DC/Melanie | #3100 | ui fixes