Removed WatermarkView & corrected some image references