lots of css stuff
merging
wdsvadfgMerge branch 'layout'
merge conflicts