little improvements
Merge branch 'feature/user-improvemtns' into develop

* feature/user-improvemtns:
  little improvements