Add image references and remove safe view.