Fix issues
Merge branch 'develop' of github.com:jvlucic/uniser-unidental-web into develop