css fixes
sync'ed to master