UI/UX rework