Added missing shapes, fixed component buttons positioning and union
input end-points set to continuous