remove css cruft
merge changes