DC/Melanie | #3839 | UI changes based on feedback-2