Some typo fixes and CSS fixes for Windows users
Merge branch 'develop' into staging