cleanup began
Merge branch 'master' into v3.9
various improvements and cleanups
removed old font awesome and made spinning indicator spin