Imrpove UX and resolve problmeatic merge
Merge branch 'issue-3/improveUX'