fix #396, #371, #368
Merge pull request #399 from laziel/fix-css-130729

fix #396, #371, #368