Css fixes
Merged all