main page added
Small refactoring before merge
Merge branch 'mainPageFeature'