Removed async problems and css
Moved css to load after content
Merge branch 'dev' into v2.0