css fixes
merged