Fixed image ordering, adding to thumbnail and sht