Fixed bugs in ADT form. Features for storing shape data to be continued by Rupesh.