Changes to UI by sameera