diff --git a/package-lock.json b/package-lock.json
index 4a51d97..13406cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3339,9 +3339,9 @@
       }
     },
     "@testing-library/user-event": {
-      "version": "12.6.3",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.6.3.tgz",
-      "integrity": "sha512-PCmbUKofE4SXA7l8jphZAbvv5H3c4ix34xPZ/GNe99fASX//msJRgiMbHIBP+GwRfgVG9c7zmkODSPu2X2vNRw==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.0.1.tgz",
+      "integrity": "sha512-7n3Y5Vohib6yVFW60JlCvQOqBDIlE1SRyo78nmoHwePAg3SVhnfyOI30RYNj3yFF7qy7e0uVlewzTyvNxyJjEA==",
       "requires": {
         "@babel/runtime": "^7.12.5"
       }
diff --git a/package.json b/package.json
index ab4412a..54b1947 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "@stripe/stripe-js": "^1.12.1",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.5",
-    "@testing-library/user-event": "^12.6.2",
+    "@testing-library/user-event": "^13.0.1",
     "bulma": "^0.9.2",
     "eslint-config-google": "^0.14.0",
     "prop-types": "^15.7.2",
diff --git a/src/components/TableRow.js b/src/components/TableRow.js
index fb32cee..dd08f53 100644
--- a/src/components/TableRow.js
+++ b/src/components/TableRow.js
@@ -38,12 +38,12 @@ const TableRow = (props) => {
   }
   if (props.data) {
     return props.data.map((item) => (
-      <tr key={`table-row-${item.uuid}`}>
-        <td><a href={`${props.prefix}/${item.uuid}`}>{item.uuid}</a></td>
+      <tr key={`table-row-${item.id}`}>
+        <td><a href={`${props.prefix}/${item.id}`}>{item.id}</a></td>
         <td><span>{item.name}</span></td>
         <TableCol attrs={attrs} data={item} />
         <CondCol rif={item.status}><StatusBadge status={item.status} /></CondCol>
-        <CondCol rif={props.action}><ActionButton action={props.action} text={props.actionLabel} url={`${props.prefix}/${item.uuid}`} /></CondCol>
+        <CondCol rif={props.action}><ActionButton action={props.action} text={props.actionLabel} url={`${props.prefix}/${item.id}`} /></CondCol>
       </tr>
     ));
   } else {
diff --git a/src/pages/Dashboard.js b/src/pages/Dashboard.js
index bfdc739..a845c5e 100644
--- a/src/pages/Dashboard.js
+++ b/src/pages/Dashboard.js
@@ -61,7 +61,7 @@ const Dashboard = () => {
       <div className="card">
         <div className="card-header">
           <h3 className="card-header-title">
-            Outputs list ({mediaList ? mediaList.total : '0'})
+            Outputs list ({mediaList ? mediaList.length : '0'})
           </h3>
         </div>
         <div className="card-content content">
diff --git a/src/pages/FileView.js b/src/pages/FileView.js
index 1882a4e..94344b1 100644
--- a/src/pages/FileView.js
+++ b/src/pages/FileView.js
@@ -33,7 +33,7 @@ const FileView = (props) => {
       <div className="card card-content content">
         <div>
           <p className="subtitle is-5 has-text-left">
-            <label>ID</label>: <strong>{media ? media.uuid : <span className="is-loading">Loading</span>}</strong>
+            <label>ID</label>: <strong>{media ? media.id : <span className="is-loading">Loading</span>}</strong>
           </p>
         </div>
         <div>
diff --git a/src/pages/TemplateWizard.js b/src/pages/TemplateWizard.js
index 44698c4..c898480 100644
--- a/src/pages/TemplateWizard.js
+++ b/src/pages/TemplateWizard.js
@@ -5,9 +5,8 @@ import {Link} from 'react-router-dom';
 
 const InputList = ({inputs}) => {
   if (!inputs) return (<option disabled>Loading</option>);
-
   return inputs.map((input, index) => (
-    <option value={input.elementName} key={`${input.elementName}-${index}`}>{input.elementName}</option>
+    <option value={input.id} key={`${input.file}-${index}`}>{input.file}</option>
   ));
 };
 
@@ -73,8 +72,8 @@ const TemplateWizard = (props) => {
   const handleFileSubmit = async (event) => {
     // TODO: create FormData
     event.preventDefault();
-    await uploadFile(new FormData(event.target));
-    window.location.href = '/file/89awefjsdfaksd';
+    const fileResp = await uploadFile(new FormData(event.target));
+    window.location.href = `/file/${fileResp.id}`;
   };
   const uploadFile = async (req) => {
     if (!globalConsumer.token) {
@@ -134,7 +133,7 @@ const TemplateWizard = (props) => {
           </div>
           <fieldset className="block">
             <legend className="subtitle is-5">Choose videos for each view:</legend>
-            <ViewInputs inputs={inputs.elements} views={media.views || []} />
+            <ViewInputs inputs={inputs} views={media.views || []} />
           </fieldset>
           <button className="button is-primary block" type="submit">Submit</button>
         </div>
diff --git a/src/pages/TemplatesView.js b/src/pages/TemplatesView.js
index 917d55c..5687089 100644
--- a/src/pages/TemplatesView.js
+++ b/src/pages/TemplatesView.js
@@ -32,7 +32,7 @@ const TemplatesView = () => {
       <div className="card">
         <div className="card-header">
           <h2 className="card-header-title">
-            Templates list ({mediaList ? mediaList.total : '0'})
+            Templates list ({mediaList ? mediaList.length : '0'})
           </h2>
           <a className="button is-info is-rounded" href="templates/new" title="Begin Process Wizard">
             New&nbsp;&nbsp;
@@ -60,7 +60,7 @@ const TemplatesView = () => {
               </tr>
             </tfoot>
             <tbody>
-              <TableRow prefix="/templates" action="/use" actionLabel="Use" attrs={attrs} data={mediaList.elements} />
+              <TableRow prefix="/templates" action="/use" actionLabel="Use" attrs={attrs} data={mediaList} />
             </tbody>
           </table>
         </div>
diff --git a/test/src/mocks/ElementResponse.json b/test/src/mocks/ElementResponse.json
index 2483c4e..3e587ee 100644
--- a/test/src/mocks/ElementResponse.json
+++ b/test/src/mocks/ElementResponse.json
@@ -13,7 +13,7 @@
       "type": "string",
       "faker": "system.fileName"
     },
-    "uuid": {
+    "id": {
       "type": "string",
       "faker": "random.uuid"
     },
@@ -37,7 +37,7 @@
   "required": [
     "elementType",
     "elementName",
-    "uuid",
+    "id",
     "creationDate",
     "updatedDate",
     "status"
diff --git a/test/src/mocks/OutputResponse.json b/test/src/mocks/OutputResponse.json
index 8f4d2ce..7e78283 100644
--- a/test/src/mocks/OutputResponse.json
+++ b/test/src/mocks/OutputResponse.json
@@ -35,7 +35,7 @@
       "type": "string",
       "faker": "date.past"
     },
-    "uuid": {
+    "id": {
       "type": "string",
       "faker": "random.uuid"
     }
@@ -46,6 +46,6 @@
     "status",
     "templateId",
     "updatedDate",
-    "uuid"
+    "id"
   ]
 }
\ No newline at end of file
diff --git a/test/src/mocks/TemplateResponse.json b/test/src/mocks/TemplateResponse.json
index 364a85a..260324b 100644
--- a/test/src/mocks/TemplateResponse.json
+++ b/test/src/mocks/TemplateResponse.json
@@ -28,7 +28,7 @@
         3840
       ]
     },
-    "uuid": {
+    "id": {
       "type": "string",
       "faker": "random.uuid"
     }
@@ -37,6 +37,6 @@
     "height",
     "views",
     "name",
-    "uuid"
+    "id"
   ]
 }
\ No newline at end of file