Merge pull request #477 from leider/master

trying to make image loading faster on  member page & small cleanups
wrong directory
Revert "wrong directory"

This reverts commit ec6c95770751c33c3a95b53cea3110387c9a7f8f.
reverting "performance boosting" :)
- because it's slower