css stuff
merge conflicts resolved