UX improvements - 1.0.2