Include Fig. no. in image filenames and improve submission generation