css fixes
fixed merge conflicts