Improvement at UX
Merge branch 'issue-3/improveUX'