Small fixes

Small fixes including replacing images with data URI.