fixe problems
Merge branch 'master' of https://github.com/SoftServeUniversity/IF-044-UI