fix preview child control and apprenticeship photos
merge and resolve conflicts