diff --git a/package-lock.json b/package-lock.json
index 9846158bf..6899b5c17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25732,12 +25732,7 @@
     },
     "@material-ui/types": {
       "version": "5.1.0",
-<<<<<<< HEAD
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz",
-      "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "@material-ui/utils": {
       "version": "4.11.2",
@@ -25802,13 +25797,8 @@
       "dependencies": {
         "immer": {
           "version": "9.0.18",
-<<<<<<< HEAD
           "optional": true,
           "peer": true
-=======
-          "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.18.tgz",
-          "integrity": "sha512-eAPNpsj7Ax1q6Y/3lm2PmlwRcFzpON7HSNQ3ru5WQH1/PSpnyed/HpNOELl2CxLKoj4r+bAHgdyKqW5gc2Se1A=="
->>>>>>> 3a69fe93 (pods - part 1)
         },
         "zustand": {
           "version": "4.3.2",
@@ -25841,13 +25831,8 @@
       "dependencies": {
         "immer": {
           "version": "9.0.18",
-<<<<<<< HEAD
           "optional": true,
           "peer": true
-=======
-          "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.18.tgz",
-          "integrity": "sha512-eAPNpsj7Ax1q6Y/3lm2PmlwRcFzpON7HSNQ3ru5WQH1/PSpnyed/HpNOELl2CxLKoj4r+bAHgdyKqW5gc2Se1A=="
->>>>>>> 3a69fe93 (pods - part 1)
         },
         "zustand": {
           "version": "4.3.2",
@@ -25871,13 +25856,8 @@
       "dependencies": {
         "immer": {
           "version": "9.0.18",
-<<<<<<< HEAD
           "optional": true,
           "peer": true
-=======
-          "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.18.tgz",
-          "integrity": "sha512-eAPNpsj7Ax1q6Y/3lm2PmlwRcFzpON7HSNQ3ru5WQH1/PSpnyed/HpNOELl2CxLKoj4r+bAHgdyKqW5gc2Se1A=="
->>>>>>> 3a69fe93 (pods - part 1)
         },
         "zustand": {
           "version": "4.3.2",
@@ -25897,13 +25877,8 @@
       "dependencies": {
         "immer": {
           "version": "9.0.18",
-<<<<<<< HEAD
           "optional": true,
           "peer": true
-=======
-          "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.18.tgz",
-          "integrity": "sha512-eAPNpsj7Ax1q6Y/3lm2PmlwRcFzpON7HSNQ3ru5WQH1/PSpnyed/HpNOELl2CxLKoj4r+bAHgdyKqW5gc2Se1A=="
->>>>>>> 3a69fe93 (pods - part 1)
         },
         "zustand": {
           "version": "4.3.2",
@@ -26108,6 +26083,7 @@
         "@tapis/tapis-typescript-authenticator": "^0.0.2",
         "@tapis/tapis-typescript-files": "^0.0.3",
         "@tapis/tapis-typescript-jobs": "^0.0.4",
+        "@tapis/tapis-typescript-pods": "^0.0.2",
         "@tapis/tapis-typescript-streams": "^0.0.4",
         "@tapis/tapis-typescript-systems": "^0.0.3",
         "@tapis/tapis-typescript-tenants": "^0.0.2",
@@ -26132,6 +26108,16 @@
     "@tapis/tapis-typescript-files": {
       "version": "0.0.3"
     },
+    "@tapis/tapis-typescript-jobs": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@tapis/tapis-typescript-jobs/-/tapis-typescript-jobs-0.0.4.tgz",
+      "integrity": "sha512-3HPgRd1OvkfDKSNecGPGcCn9PcfUYB0XMasLR65BXwrjxM8CKDJ/nru30hUspkjQ5RahfL7LDO47wnCjCbt2Cw=="
+    },
+    "@tapis/tapis-typescript-pods": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@tapis/tapis-typescript-pods/-/tapis-typescript-pods-0.0.2.tgz",
+      "integrity": "sha512-S2PNola31mw11lK6oR16IXkrqXbxuJ4viSMKM08YHlsoGlpueoDyUXiVgf2sp3/gJ3vlSZwRlCfut6DstasQvA=="
+    },
     "@tapis/tapis-typescript-streams": {
       "version": "0.0.4"
     },
@@ -26146,7 +26132,6 @@
       "resolved": "https://registry.npmjs.org/@tapis/tapis-typescript-workflows/-/tapis-typescript-workflows-0.0.7.tgz",
       "integrity": "sha512-oe0uyPWV959reorHNoLQLY/JoLXZ9JfSor+Npv1zUEp5Ob0/TGnHO//42XZO/ZX09laDDlyARyt970VBJLcELA=="
     },
-<<<<<<< HEAD
     "@testing-library/dom": {
       "version": "9.3.4",
       "dev": true,
@@ -26280,8 +26265,6 @@
         }
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "@testing-library/jest-dom": {
       "version": "5.14.1",
       "dev": true,
@@ -27336,12 +27319,7 @@
     },
     "acorn-jsx": {
       "version": "5.3.2",
-<<<<<<< HEAD
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "acorn-walk": {
       "version": "7.2.0"
@@ -27380,21 +27358,11 @@
     },
     "ajv-errors": {
       "version": "1.0.1",
-<<<<<<< HEAD
       "requires": {}
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
-    },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "alphanum-sort": {
       "version": "1.0.2"
@@ -27472,7 +27440,6 @@
     "arr-union": {
       "version": "3.1.0"
     },
-<<<<<<< HEAD
     "array-buffer-byte-length": {
       "version": "1.0.0",
       "dev": true,
@@ -27482,8 +27449,6 @@
         "is-array-buffer": "^3.0.1"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "array-flatten": {
       "version": "2.1.2"
     },
@@ -27606,14 +27571,11 @@
         "postcss-value-parser": "^4.1.0"
       }
     },
-<<<<<<< HEAD
     "available-typed-arrays": {
       "version": "1.0.5",
       "dev": true,
       "peer": true
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "axe-core": {
       "version": "4.3.2"
     },
@@ -27767,12 +27729,7 @@
     },
     "babel-plugin-named-asset-import": {
       "version": "0.3.7",
-<<<<<<< HEAD
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz",
-      "integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "babel-plugin-polyfill-corejs2": {
       "version": "0.2.2",
@@ -28219,12 +28176,7 @@
     },
     "bootstrap": {
       "version": "4.6.0",
-<<<<<<< HEAD
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz",
-      "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "boxen": {
       "version": "7.0.0",
@@ -29905,7 +29857,6 @@
         "unbox-primitive": "^1.0.1"
       }
     },
-<<<<<<< HEAD
     "es-get-iterator": {
       "version": "1.1.3",
       "dev": true,
@@ -29929,8 +29880,6 @@
         }
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "es-to-primitive": {
       "version": "1.2.1",
       "requires": {
@@ -30144,14 +30093,8 @@
     },
     "eslint-config-prettier": {
       "version": "8.3.0",
-<<<<<<< HEAD
       "dev": true,
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
-      "dev": true
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "eslint-config-react-app": {
       "version": "6.0.0",
@@ -30334,12 +30277,7 @@
     },
     "eslint-plugin-react-hooks": {
       "version": "4.2.0",
-<<<<<<< HEAD
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz",
-      "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "eslint-plugin-testing-library": {
       "version": "3.10.2",
@@ -30921,7 +30859,6 @@
     "follow-redirects": {
       "version": "1.14.1"
     },
-<<<<<<< HEAD
     "for-each": {
       "version": "0.3.3",
       "dev": true,
@@ -30930,8 +30867,6 @@
         "is-callable": "^1.1.3"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "for-in": {
       "version": "1.0.2"
     },
@@ -31972,7 +31907,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-<<<<<<< HEAD
     "is-array-buffer": {
       "version": "3.0.2",
       "dev": true,
@@ -31983,8 +31917,6 @@
         "is-typed-array": "^1.1.10"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "is-arrayish": {
       "version": "0.2.1"
     },
@@ -32089,14 +32021,11 @@
     "is-in-browser": {
       "version": "1.1.3"
     },
-<<<<<<< HEAD
     "is-map": {
       "version": "2.0.2",
       "dev": true,
       "peer": true
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "is-module": {
       "version": "1.0.0"
     },
@@ -32161,7 +32090,6 @@
     "is-root": {
       "version": "2.1.0"
     },
-<<<<<<< HEAD
     "is-set": {
       "version": "2.0.2",
       "dev": true,
@@ -32175,8 +32103,6 @@
         "call-bind": "^1.0.2"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "is-stream": {
       "version": "2.0.1"
     },
@@ -32192,7 +32118,6 @@
         "has-symbols": "^1.0.2"
       }
     },
-<<<<<<< HEAD
     "is-typed-array": {
       "version": "1.1.12",
       "dev": true,
@@ -32201,12 +32126,9 @@
         "which-typed-array": "^1.1.11"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "is-typedarray": {
       "version": "1.0.0"
     },
-<<<<<<< HEAD
     "is-weakmap": {
       "version": "2.0.1",
       "dev": true,
@@ -32221,8 +32143,6 @@
         "get-intrinsic": "^1.1.1"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "is-windows": {
       "version": "1.0.2"
     },
@@ -32823,12 +32743,7 @@
     },
     "jest-pnp-resolver": {
       "version": "1.2.2",
-<<<<<<< HEAD
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "jest-regex-util": {
       "version": "26.0.0"
@@ -33407,13 +33322,10 @@
         }
       }
     },
-<<<<<<< HEAD
     "jquery": {
       "version": "3.7.1",
       "peer": true
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "js-base64": {
       "version": "2.6.4"
     },
@@ -36111,21 +36023,11 @@
     },
     "react-step-wizard": {
       "version": "5.3.9",
-<<<<<<< HEAD
       "requires": {}
     },
     "react-table": {
       "version": "7.7.0",
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/react-step-wizard/-/react-step-wizard-5.3.9.tgz",
-      "integrity": "sha512-CJdWckYHAYZOD8E8p38EiFpyIJoknouroyFy6AV3YzTcCMyiyivzLMxruUZUUoKqriZH70Ik9wadBCoGSVzW0Q=="
-    },
-    "react-table": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/react-table/-/react-table-7.7.0.tgz",
-      "integrity": "sha512-jBlj70iBwOTvvImsU9t01LjFjy4sXEtclBovl3mTiqjz23Reu0DKnRza4zlLtOPACx6j2/7MrQIthIK1Wi+LIA=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "react-transition-group": {
       "version": "4.4.2",
@@ -37546,7 +37448,6 @@
     "statuses": {
       "version": "1.5.0"
     },
-<<<<<<< HEAD
     "stop-iteration-iterator": {
       "version": "1.0.0",
       "dev": true,
@@ -37555,8 +37456,6 @@
         "internal-slot": "^1.0.4"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "stream-browserify": {
       "version": "2.0.2",
       "requires": {
@@ -37590,7 +37489,6 @@
     "strict-uri-encode": {
       "version": "1.1.0"
     },
-<<<<<<< HEAD
     "string_decoder": {
       "version": "1.3.0",
       "requires": {
@@ -37602,8 +37500,6 @@
         }
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "string-hash": {
       "version": "1.1.3"
     },
@@ -38159,14 +38055,11 @@
     "type-detect": {
       "version": "4.0.8"
     },
-<<<<<<< HEAD
     "type-fest": {
       "version": "0.13.1",
       "optional": true,
       "peer": true
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "type-is": {
       "version": "1.6.18",
       "requires": {
@@ -38436,12 +38329,7 @@
     },
     "use-sync-external-store": {
       "version": "1.2.0",
-<<<<<<< HEAD
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "util": {
       "version": "0.11.1",
@@ -39459,7 +39347,6 @@
         "is-symbol": "^1.0.3"
       }
     },
-<<<<<<< HEAD
     "which-collection": {
       "version": "1.0.1",
       "dev": true,
@@ -39471,12 +39358,9 @@
         "is-weakset": "^2.0.1"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "which-module": {
       "version": "2.0.0"
     },
-<<<<<<< HEAD
     "which-typed-array": {
       "version": "1.1.13",
       "dev": true,
@@ -39489,8 +39373,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-=======
->>>>>>> 3a69fe93 (pods - part 1)
     "widest-line": {
       "version": "4.0.1",
       "requires": {
@@ -39727,12 +39609,7 @@
     },
     "ws": {
       "version": "7.5.3",
-<<<<<<< HEAD
       "requires": {}
-=======
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="
->>>>>>> 3a69fe93 (pods - part 1)
     },
     "xml-name-validator": {
       "version": "3.0.0"
diff --git a/package.json b/package.json
index 037131416..012574062 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@fortawesome/react-fontawesome": "^0.1.8",
     "@material-ui/core": "^4.12.3",
     "@reduxjs/toolkit": "^1.5.1",
-    "@tapis/tapis-typescript": "^0.0.24",
+    "@tapis/tapis-typescript": "^0.0.26",
     "@uiw/react-codemirror": "^4.19.7",
     "@uiw/react-textarea-code-editor": "^2.0.6",
     "axios": "^0.21.4",
diff --git a/src/fixtures/pods.fixtures.ts b/src/fixtures/pods.fixtures.ts
index b5826751a..927c20491 100644
--- a/src/fixtures/pods.fixtures.ts
+++ b/src/fixtures/pods.fixtures.ts
@@ -1,30 +1,13 @@
-import { Systems } from '@tapis/tapis-typescript';
+import { Pods } from '@tapis/tapis-typescript';
 
-export const dockerRuntime: Systems.JobRuntime = {
-  runtimeType: Systems.RuntimeTypeEnum.Docker,
-  version: '0.0.1',
-};
-
-export const singularityRuntime: Systems.JobRuntime = {
-  runtimeType: Systems.RuntimeTypeEnum.Singularity,
-  version: '0.0.1',
-};
-
-export const jobRuntimes: Array<Systems.JobRuntime> = [
-  { ...dockerRuntime },
-  { ...singularityRuntime },
-];
-
-export const tapisSystem: Systems.TapisSystem = {
+export const tapisSystem = {
   tenant: 'tacc',
   id: 'testuser2.execution',
   description: 'Tapis v3 execution system - patched',
-  systemType: Systems.SystemTypeEnum.Linux,
   owner: 'nathandf',
   host: '129.114.17.113',
   enabled: true,
   effectiveUserId: 'testuser2',
-  defaultAuthnMethod: Systems.AuthnEnum.PkiKeys,
   authnCredential: undefined,
   bucketName: undefined,
   rootDir: '/home/testuser2/prod/',
@@ -38,12 +21,10 @@ export const tapisSystem: Systems.TapisSystem = {
   isDtn: false,
   canExec: true,
   canRunBatch: true,
-  jobRuntimes: jobRuntimes,
   jobWorkingDir: 'work',
   jobEnvVariables: [],
   jobMaxJobs: 2147483647,
   jobMaxJobsPerUser: 2147483647,
-  batchScheduler: Systems.SchedulerTypeEnum.Slurm,
   batchLogicalQueues: [
     {
       name: 'tapisNormal',
diff --git a/src/tapis-ui/_common/GenericModal/GenericModal.tsx b/src/tapis-ui/_common/GenericModal/GenericModal.tsx
index 5617c8cf1..264435d60 100644
--- a/src/tapis-ui/_common/GenericModal/GenericModal.tsx
+++ b/src/tapis-ui/_common/GenericModal/GenericModal.tsx
@@ -17,7 +17,7 @@ const GenericModal: React.FC<GenericModalProps> = ({
   ...props
 }) => {
   return (
-    <Modal isOpen={true} toggle={toggle} {...props}>
+    <Modal backdrop="static" keyboard={true} isOpen={true} toggle={toggle} {...props}>
       <ModalHeader toggle={toggle} charCode="&#x2715;">
         <span>{title}</span>
       </ModalHeader>
diff --git a/src/tapis-ui/components/pods/PodDetail/PodDetail.tsx b/src/tapis-ui/components/pods/PodDetail/PodDetail.tsx
index 4eadd944f..ca6a3750f 100644
--- a/src/tapis-ui/components/pods/PodDetail/PodDetail.tsx
+++ b/src/tapis-ui/components/pods/PodDetail/PodDetail.tsx
@@ -15,8 +15,8 @@ const PodDetail: React.FC<{ podId: string }> = ({ podId }) => {
       {pod && (
         <Tabs
           tabs={{
-            Details: <DescriptionList data={pod} />,
             JSON: <JSONDisplay json={pod} />,
+            Details: <DescriptionList data={pod} />,
           }}
         />
       )}