Svg and refactor

Migrate to svg and refactors