Fix image links, add categories