minor fixes
merged
css
merged