Add icons and improve UX