Modifies CSS and add main content.
Merge branch 'dev'