Modify layout
Merge pull request #35 from santifinland/feature/analytics

Modify layout
Merge pull request #36 from santifinland/develop

Develop