Converted to using view models, included gravatars