DC/Melanie | #0000 | UI changes based on feedback