Added base64 images and cleaned some stuff up