Refactor images and paper links