Front page rework
Merge pull request #346 from ArturG/front-page-rework

Front page rework