added some svg stuff
Fixed merge conflicts