some css work
more css fixes
manual merge