Redo images and tweak forms