small CSS fixes
merge conflicts