Fixed typos and CSS errors
Merge branch 'devel' into source