changed styling
merge conflicts
css changes
css updates
styles
fixed all the merge conflicts
Merge branch 'CSS_serena' into dev