Replace the images and improve the form UI