Revert "New changes to be commited from UI"

This reverts commit 451614a321e260befc3ea681f3abf2c6d3ac4438.
Revert "Revert "New changes to be commited from UI""

This reverts commit 0b25e5720815f5d0378463ed0e4f41c2244a7667.