User gallery refactored