updated css
Merge branch 'tylernew_branch'