Added the remaining shapes for modeler

Multi cell span is also working better now