Some CSS edits
Merge branch 'Working'