Added shape type radio button (can choose between ellipse and (rounded) rectangle