UX/UI modified