Updates to the main page

Merged Marin Jankovski requested to merge main_page into master

As part of #10 (closed)