Correcting styles
Merge branch 'master' into clientjs