more css
css changes
my changes
fixed merge issues
more css
fixed merge conflicts