fixed CSS applying
Merge branch 'master' into beta