cleanup and loadingdata-ify
Merge branch 'master' of github.com:corani/corani.github.io