Improve UX
Merge branch 'feature/improve_user_experience' into develop