Added analytics and made UX a little better