Changed CSS and HTML layout
Merge branch 'develop' into staging