Fixed some spacing issues
Merge branch 'web' into develop