Profile Images, fixes

Added profile images
Code cleanup