Updated to use tagged images
Tidied up forms to have less whitespace