Update Design and UX