Set loading to click toggle
Merge branch 'develop'
"Update autoloading to use toggle"