Mansi | #466 | ui changes