modified UI/UX