Melanie |#3700 | UI changes