Resolve #2: Only show thumbnail for picture and put it first in row