added popup, modified image folders