Added delete image and several improvements