diff --git a/.vs/template-builder/FileContentIndex/cfce438f-c91f-4dfd-95ac-c2921ea69022.vsidx b/.vs/template-builder/FileContentIndex/cfce438f-c91f-4dfd-95ac-c2921ea69022.vsidx
new file mode 100644
index 0000000..cb969a5
Binary files /dev/null and b/.vs/template-builder/FileContentIndex/cfce438f-c91f-4dfd-95ac-c2921ea69022.vsidx differ
diff --git a/.vs/template-builder/FileContentIndex/e6cb0543-85c0-4dc3-858d-3e6653e1c4af.vsidx b/.vs/template-builder/FileContentIndex/e6cb0543-85c0-4dc3-858d-3e6653e1c4af.vsidx
new file mode 100644
index 0000000..c3e221f
Binary files /dev/null and b/.vs/template-builder/FileContentIndex/e6cb0543-85c0-4dc3-858d-3e6653e1c4af.vsidx differ
diff --git a/src/components/questionCreation/QuestionForm.jsx b/src/components/questionCreation/QuestionForm.jsx
index 7d22645..fc9adc9 100644
--- a/src/components/questionCreation/QuestionForm.jsx
+++ b/src/components/questionCreation/QuestionForm.jsx
@@ -94,8 +94,8 @@ const materialUseStyles = makeStyles(theme => ({
   },
   answerTermGroup: {
     display: 'flex',
-    width: 430,
-    justifyContent: 'space-between',
+    width: 'auto',
+    // justifyContent: 'space-between',
     alignItems: 'baseline'
   },
   button: {
@@ -986,6 +986,7 @@ const QuestionForm = props => {
               <IconButton
                 // size="small"
                 className={classes.iconButton}
+                style={{ top: '6px' }}
                 onClick={() => {
                   // Objects are ordered:
                   // https://stackoverflow.com/questions/30076219/does-es6-introduce-a-well-defined-order-of-enumeration-for-object-properties
@@ -1024,6 +1025,7 @@ const QuestionForm = props => {
               <IconButton
                 // size="small"
                 className={classes.iconButton}
+                style={{ top: '6px' }}
                 onClick={() => {
                   // The same code as above, but the sorted array has its order swapped.
                   // This is for demonstration purposes, as I can't imagine anyone needs
@@ -1050,27 +1052,36 @@ const QuestionForm = props => {
             </Tooltip>
           </>
         )}
-        <FormControl className={classes.geometricShape}>
-          <InputLabel id="GeometricShape">Geometric Shape</InputLabel>
-          <Select
-            labelId="GeometricShape"
-            value={GeometricShape}
-            onChange={e => {
-              postQuestion({ ...formInput, GeometricShape: e.target.value });
-              setGeometricShape(e.target.value);
-            }}
-            disabled={selectedTerms && Object.keys(selectedTerms).length > 0}
-          >
-            <MenuItem value="">
-              <em>None</em>
-            </MenuItem>
-            {Object.keys(geometricShapes).map(el => (
-              <MenuItem value={el} key={el}>
-                {geometricShapes[el]}
-              </MenuItem>
-            ))}
-          </Select>
-        </FormControl>
+        {questionType === 'anatomic' && (
+          <>
+            <FormControl className={classes.geometricShape}>
+              <InputLabel id="GeometricShape">Geometric Shape</InputLabel>
+              <Select
+                labelId="GeometricShape"
+                value={GeometricShape}
+                onChange={e => {
+                  postQuestion({
+                    ...formInput,
+                    GeometricShape: e.target.value
+                  });
+                  setGeometricShape(e.target.value);
+                }}
+                disabled={
+                  selectedTerms && Object.keys(selectedTerms).length > 0
+                }
+              >
+                <MenuItem value="">
+                  <em>None</em>
+                </MenuItem>
+                {Object.keys(geometricShapes).map(el => (
+                  <MenuItem value={el} key={el}>
+                    {geometricShapes[el]}
+                  </MenuItem>
+                ))}
+              </Select>
+            </FormControl>
+          </>
+        )}
       </div>
       {/* </div> */}
       {/* {answerType === 'scale' && characteristic && (