some small CSS fixes.
resolving  merge conflicts.