diff --git a/vue/src/components/Uploader/UploadedImage.vue b/vue/src/components/Uploader/Image.vue
similarity index 92%
rename from vue/src/components/Uploader/UploadedImage.vue
rename to vue/src/components/Uploader/Image.vue
index 24aacbd3..e9221617 100644
--- a/vue/src/components/Uploader/UploadedImage.vue
+++ b/vue/src/components/Uploader/Image.vue
@@ -80,6 +80,14 @@ export default {
     overflow: hidden;
     position: relative;
     z-index: 2;
+    display: flex;
+    align-items: center;
+
+    img {
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
 
     i.fa-file-pdf-o {
       color: #F40F02;
@@ -95,7 +103,6 @@ export default {
       content: "\f06e";
       position: absolute;
       left: 58px;
-      top: 65px;
       font-size: 43px;
       color: transparent;        
     }
@@ -129,13 +136,19 @@ export default {
       left: 130px;
       background-color: white;
       border-radius: 10px;
-      height: 22px;
+      height: 18px;
       line-height: 1;
       z-index: 4;
 
       i.fa {
         color: #365EBE;
         font-size: 23px;
+
+        &::before {
+          display: block;
+          margin-top: -2px;
+          margin-left: -1px;
+        }
       }
     }
   }
diff --git a/vue/src/components/Uploader/ItemTile.vue b/vue/src/components/Uploader/ItemTile.vue
index 0ac754b6..27c37bd8 100644
--- a/vue/src/components/Uploader/ItemTile.vue
+++ b/vue/src/components/Uploader/ItemTile.vue
@@ -3,7 +3,7 @@
     <uploaded-image :file="file" :image-style="imageStyle" @imageclick="showPreview" @removeclick="$emit('remove')" />
     <div class="bottom-wrapper">
       <div class="item-text">
-        {{file.name}} ({{ Math.round(file.size/1024 * 100) / 100 }}KB)
+        {{file.name}} <span class="no-wrap">({{ Math.round(file.size/1024/1024 * 100) / 100 }} MB)</span>
       </div>
       <div class="button-wrapper">
         <div v-if="!file.active && file.success && !isPdf">
@@ -20,7 +20,7 @@
             <i class="fa fa-undo fa-flip-horizontal"></i>
           </button>
         </div>
-        <div class="alert alert-danger" style="padding: 4px; margin-bottom: 0" v-if="file.error">Upload Error</div>
+        <div class="alert alert-danger" v-if="file.error">Upload Error</div>
       </div>
     </div>
   </div>
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import UploadedImage from './UploadedImage'
+import UploadedImage from './Image'
 import ProgressBar from './ProgressBar'
 
 export default {
@@ -77,6 +77,10 @@ export default {
       padding: 5px;
       line-height: 1.05;
       font-size: 0.95em;
+
+      .no-wrap {
+        white-space: nowrap;
+      }
     }
 
     .button-wrapper {
@@ -89,6 +93,11 @@ export default {
       border: 1px solid silver;
       background-color: #F2F2F2;
       margin-bottom: 10px;
+      
+      .alert-danger {
+        margin-bottom: 0;
+        padding: 0;
+      }
     }
   }
 </style>
diff --git a/vue/src/components/Uploader/Main.vue b/vue/src/components/Uploader/Main.vue
index 04606ee5..f7a0bde6 100644
--- a/vue/src/components/Uploader/Main.vue
+++ b/vue/src/components/Uploader/Main.vue
@@ -1,57 +1,82 @@
 <template>
 <div>
   <h5 class="uploader-label">
-    {{ formInfo.preText }} 
+    {{ formDef.preText }} 
     <a href="javascript:void(0)" :id="'Tooltip-' + uniqueId">
-      {{ formInfo.name }} <i class="fa fa-question-circle"></i>
+      {{ formDef.name }} <i class="fa fa-question-circle"></i>
     </a>
     <strong v-if="party === 1"> - For You</strong>
     <strong v-if="party === 2"> - For Your Spouse</strong>
   </h5>  
-  <tooltip :text="formInfo.help" :target="'#Tooltip-' + uniqueId"></tooltip>
+  <tooltip :text="formDef.help" :target="'#Tooltip-' + uniqueId"></tooltip>
   <label :for="inputId" class="sr-only">
-    {{ formInfo.preText }} {{ formInfo.name }} 
+    {{ formDef.preText }} {{ formDef.name }} 
     <span v-if="party === 1"> - For You</span>
     <span v-if="party === 2"> - For Your Spouse</span>
   </label>
-  <div @dragover="draggingOn" @dragenter="draggingOn" @dragleave="draggingOff" @dragend="draggingOff" @drop="draggingOff">
+  <div @dragover="dragOn" @dragenter="dragOn" @dragleave="dragOff" @dragend="dragOff" @drop="dragOff">
     <file-upload
       ref="upload"
       v-model="files"
       :multiple="true"
+      :maximum="maxFiles"
+      :size="maxMegabytes * 1024 * 1024"      
       :drop="true"
       :drop-directory="false"
       :post-action="postAction"
       :input-id="inputId"
       name="file"
       :class="['drop-zone', dragging ? 'dragging' : '']"
-      :data="inputIdentifiers"
+      :data="inputKeys"
       @input-file="inputFile"
       @input-filter="inputFilter">
     <div v-if="files.length === 0" class="placeholder">
       <i class="fa fa-plus-circle"></i><br>
       <em>Drag and Drop the PDF document or JPG pages here,<br>or click here to Browse for files.</em>
     </div>
-    <div v-else class="cards">
-      <div v-for="(file, index) in files" v-bind:key="index" class="card">
-        <item-tile
-          :file="file"
-          :index="index"
-          :file-count="files.length"
-          @remove="remove(file)"
-          @moveup="moveUp(index)"
-          @movedown="moveDown(index)"
-          @rotateleft="rotateLeft(index)"
-          @rotateright="rotateRight(index)"/>
+    <template v-else>
+      <div class="text-danger error-top" v-if="fileErrors === 1">
+        <strong>One file has failed to upload to the server. Please remove the file marked 'Upload Error' and try uploading it again.</strong>
       </div>
-      <div class="card upload-button">
-        <div class="upload-button-wrapper">
-        <i class="fa fa-plus-circle"></i>
+      <div class="text-danger error-top" v-if="fileErrors > 1">
+        <strong>Some files have failed to upload to the server. Please remove the files marked 'Upload Error' and try uploading them again.</strong>
+      </div>      
+      <div class="text-danger error-top" v-if="tooBig">
+        <strong>The total of all uploaded files for this form cannot exceed {{ maxMegabytes }} MB.
+        Please reduce the size of your files so the total is below this limit.</strong>
+      </div>
+      <div class="cards">
+        <div v-for="(file, index) in files" v-bind:key="index" class="card">
+          <item-tile
+            :file="file"
+            :index="index"
+            :file-count="files.length"
+            @remove="remove(file)"
+            @moveup="moveUp(index)"
+            @movedown="moveDown(index)"
+            @rotateleft="rotateLeft(index)"
+            @rotateright="rotateRight(index)"/>
+        </div>
+        <div class="card upload-button" v-if="!tooBig">
+          <div class="upload-button-wrapper">
+          <i class="fa fa-plus-circle"></i>
+          </div>
         </div>
+      </div>
+      <div class="text-danger pull-right error-bottom" v-if="tooBig">
+        <em>
+          <strong>
+            (Total {{ Math.round(totalSize/1024/1024 * 100) / 100 }} 
+            MB of {{ maxMegabytes }} MB)
+          </strong>
+        </em>
       </div>      
-    </div>
+    </template>
     </file-upload>
   </div>
+  <div class="pull-right" v-if="!tooBig">
+    <em>(Maximum {{ maxMegabytes }} MB)</em>
+  </div>
   <modal ref="warningModal" v-model="showWarning">
     {{ warningText }}
   </modal>
@@ -62,7 +87,7 @@
 import VueUploadComponent from 'vue-upload-component'
 import { Tooltip, Modal } from 'uiv';
 import ItemTile from './ItemTile'
-import Forms from "../../utils/forms";
+import FormDefinitions from "../../utils/forms";
 import rotateFix from '../../utils/rotation';
 
 export default {
@@ -72,6 +97,8 @@ export default {
   },
   data: function () {
     return {
+      maxFiles: 30,
+      maxMegabytes: 10,
       files: [],
       dragging: false,
       showWarning: false,
@@ -86,26 +113,47 @@ export default {
     Modal
   },
   computed: {
-    uniqueId() {
-      if (this.party === 0) {
-        return this.docType;
-      }
-      return this.docType + this.party;
-    },    
     inputId() {
       return "Uploader-" + this.uniqueId;
     },
-    formInfo() {
-      return Forms[this.docType];
+    inputKeys() {
+      return {
+        doc_type: this.docType,
+        party_code: this.party
+      };
+    },    
+    formDef() {
+      return FormDefinitions[this.docType];
     },
     postAction() {
       return this.$parent.proxyRootPath + "poc/storage"
     },
-    inputIdentifiers() {
-      return {
-        doc_type: this.docType, 
-        party_code: this.party
-      };
+    uniqueId() {
+      if (this.party === 0) {
+        return this.docType;
+      }
+      return this.docType + this.party;
+    },
+    totalSize() {
+      let size = 0;
+      this.files.forEach((file) => {
+        if (!file.error) {
+          size += file.size;
+        }
+      });
+      return size;
+    },
+    fileErrors() {
+      let count = 0;
+      this.files.forEach((file) => {
+        if (file.error) {
+          count++;
+        }
+      });
+      return count;
+    },    
+    tooBig() {
+      return this.totalSize > this.maxMegabytes * 1024 * 1024;
     }
   },
   methods: {
@@ -122,8 +170,7 @@ export default {
           //  Get the response status code (we can use this for error handling)
           if (newFile.xhr.status !== 200) {
             // todo: handler errors
-             this.warningText = 'Error: ' + newFile.xhr.statusText;
-             this.showWarning = true;            
+            this.showError('Error: ' + newFile.xhr.statusText);
             console.log('status', newFile.xhr.status)
           }
         }
@@ -134,29 +181,44 @@ export default {
       if (newFile && !oldFile) {
         // Filter non-image file
         if (!/\.(jpeg|jpg|gif|png|pdf)$/i.test(newFile.name)) {
-          this.warningText = 'Unsupported file type.  Allowed extensions are jpeg, jpg, gif,png and pdf.';
-          this.showWarning = true;
+          this.showError('Unsupported file type.  Allowed extensions are jpeg, jpg, gif,png and pdf.');
           return prevent()
         }
 
         this.files.forEach((file) => {
           // prevent duplicates (based on filename and length)
           if (file.name === newFile.name && file.length === newFile.length) {
-             this.warningText = 'Duplicate file: ' + newFile.name;
-             this.showWarning = true;
-             return prevent();
+            this.showError('Duplicate file: ' + newFile.name);
+            return prevent();
           }
         });
-  
       }
 
       if (newFile) {
+        // make sure the user isn't uploading more MB of files than allowed
+        if (this.totalSize > this.maxMegabytes * 1024 * 1024) {
+          this.showError('The total of all uploaded files for this form cannot exceed ' + this.maxMegabytes + ' MB. Please reduce the size of your files so the total is below this limit.');
+
+          // only allow one file over the limit (so we can show the red messaging on the screen)
+          let previousTotalSize = 0;
+          this.files.forEach((file) => {
+            if ((file.name !== newFile.name || file.size !== newFile.size) && !file.error) {
+              previousTotalSize += file.size;
+            }
+          });
+
+          // if the user is more than one file over the limit, then block the upload
+          if (previousTotalSize > this.maxMegabytes * 1024 * 1024) {
+            this.$refs.upload.remove(newFile);
+            return prevent();
+          }
+        }
+
         // if it's a PDF, make sure it's the only item being uploaded
         if (newFile.type === 'application/pdf') {
           if (this.files.length > 0) {
             if (this.files[0].name != newFile.name || this.files[0].length != newFile.length) {
-              this.warningText = 'Only one PDF is allowed per form, and PDF documents cannot be combined with images.';
-              this.showWarning = true;
+              this.showError('Only one PDF is allowed per form, and PDF documents cannot be combined with images.');
               this.$refs.upload.remove(newFile);
               return prevent();
             }
@@ -166,13 +228,12 @@ export default {
           // if it's not a PDF, make sure there are no PDFs already uplaoded
           this.files.forEach((file) => {
             if (file.type === 'application/pdf') {
-              this.warningText = 'PDF documents cannot be combined with images.';
-              this.showWarning = true;
+              this.showError('PDF documents cannot be combined with images.');
               this.$refs.upload.remove(newFile);
               return prevent();
             }
           });
-        } 
+        }
 
         // Add extra data to to the file object
         newFile.objectURL = ''
@@ -213,12 +274,16 @@ export default {
       this.files[index].rotation += 90;
       this.isDirty = true;
     },    
-    draggingOn() {
+    dragOn() {
       this.dragging = true;
     },
-    draggingOff() {
+    dragOff() {
       this.dragging = false;
     },
+    showError(message) {
+      this.warningText = message;
+      this.showWarning = true;
+    },   
     saveMetaData() {
       let allFiles = [];
       this.files.forEach((file) => {
@@ -259,10 +324,6 @@ export default {
     border-radius: 6px;
     padding: 18px;
 
-    &:hover .fa-plus-circle {
-      opacity: 0.85;
-    }
-
     &.dragging {
       background-color: #F2E3F2;
     }
@@ -295,6 +356,14 @@ export default {
     .placeholder {
       text-align: center;
     }
+
+    .error-top {
+      padding-bottom: 16px;
+    }
+
+    .error-bottom {
+      margin-bottom: -10px;
+    }
   }
 
   h5.uploader-label {