Few UI/UX Changes