added pictures, fixed n+1 query bug