Working on the pictures preview.
Refactoring.