Added support for viewing users uploads
Merge with master