Closes #5 and #6
Merge pull request #7 from elcodi/feature/some-fixes-in-main-page

Closes #5 and #6