fixed bugs and changed the structure a bit

[vercel[bot]]

This pull request is automatically deployed with Now. To access deployments, click Details below or on the icon next to each push.

Latest deployment for this branch: https://homepage-git-hotfix.vynarni.now.sh