Added option to select shape in GUI.