Added move support for shapes, fixed Triangle