Fixed appending issue with svg and circles
Fixed merge conflict with js