Refactors form for new pictures