Redesign main page and bugs
Merge branch 'develop' into staging
Fixed css bug