Adjust CSS, and Map Scaffolding on Home Page
Merge branch 'dev'