Pictures details&refactor