Add logs
Svg changes
fix merge issues