Merge "Epic-232:Modifying UI changes"