working on updating site
Merge branch 'redesign'
Apply new styles to site