Refactor and image links fix.