added menu / image folder handling