Added <g> as parent of shape and text and added drag behaivor