Collage preview added, code was refactored