Make it possible to remove images + various field fixes