Updated with latest UX design