diff --git a/nirc_ehr/resources/queries/nirc_ehr/necropsyTasks/.qview.xml b/nirc_ehr/resources/queries/nirc_ehr/necropsyTasks/.qview.xml
index 908527e7..ef613fe0 100644
--- a/nirc_ehr/resources/queries/nirc_ehr/necropsyTasks/.qview.xml
+++ b/nirc_ehr/resources/queries/nirc_ehr/necropsyTasks/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="viewNecropsy"/>
         <column name="enterNecropsyData"/>
diff --git a/nirc_ehr/resources/queries/study/arrival.query.xml b/nirc_ehr/resources/queries/study/arrival.query.xml
index 3b8933b1..5054e517 100644
--- a/nirc_ehr/resources/queries/study/arrival.query.xml
+++ b/nirc_ehr/resources/queries/study/arrival.query.xml
@@ -30,7 +30,6 @@
                         </fk>
                     </column>
                     <column columnName="attachmentFile">
-                        <isHidden>true</isHidden>
                     </column>
                     <column columnName="cage">
                         <displayWidth>80</displayWidth>
diff --git a/nirc_ehr/resources/web/nirc_ehr/field/EditCase.js b/nirc_ehr/resources/web/nirc_ehr/field/EditCase.js
index ca82a78e..dff6631f 100644
--- a/nirc_ehr/resources/web/nirc_ehr/field/EditCase.js
+++ b/nirc_ehr/resources/web/nirc_ehr/field/EditCase.js
@@ -74,10 +74,14 @@ Ext4.define('NIRC_EHR.form.EditCases', {
     fieldEnableChange: function(disable){
         var panel = this.up('panel');
         panel.items.each(function(item){
-            if (item.name != 'objectid'){
-                this.disableItem(item, disable);
-                this.disabledDisplay(item, disable);
-            }
+            if (item.name === 'objectid')
+                return;
+
+            // A saved case stays bound to its animal, so Edit must never reopen the Id.
+            var itemDisable = disable || (this.editing && item.name === 'Id');
+
+            this.disableItem(item, itemDisable);
+            this.disabledDisplay(item, itemDisable);
         }, this);
     },
 
@@ -93,11 +97,11 @@ Ext4.define('NIRC_EHR.form.EditCases', {
     },
 
     onCaseSelect: function(){
+        this.editing = true;
         this.fieldEnableChange(true);
         if (this.readonly) {
             return;
         }
-        this.editing = true;
         this.disabled = true;
         this.editBtn.show();
     },
diff --git a/nirc_ehr/resources/web/nirc_ehr/model/sources/Arrival.js b/nirc_ehr/resources/web/nirc_ehr/model/sources/Arrival.js
index 25e29fc9..f6f4b367 100644
--- a/nirc_ehr/resources/web/nirc_ehr/model/sources/Arrival.js
+++ b/nirc_ehr/resources/web/nirc_ehr/model/sources/Arrival.js
@@ -39,7 +39,10 @@ EHR.model.DataModelManager.registerMetadata('Arrival', {
                 allowBlank: false
             },
             'Id/demographics/birth': {
-                allowBlank: false
+                allowBlank: false,
+                columnConfig: {
+                    width: 150
+                }
             },
             'Id/demographics/gender': {
                 allowBlank: false
@@ -107,6 +110,11 @@ EHR.model.DataModelManager.registerMetadata('Arrival', {
                 allowBlank: true,
                 hidden: true,
                 showInGrid: false
+            },
+            attachmentFile: {
+                columnConfig: {
+                    width: 150
+                }
             }
         }
     }
diff --git a/nirc_ehr/resources/web/nirc_ehr/model/sources/Rearrival.js b/nirc_ehr/resources/web/nirc_ehr/model/sources/Rearrival.js
index 94ae9c4c..6e50ab81 100644
--- a/nirc_ehr/resources/web/nirc_ehr/model/sources/Rearrival.js
+++ b/nirc_ehr/resources/web/nirc_ehr/model/sources/Rearrival.js
@@ -80,6 +80,11 @@ EHR.model.DataModelManager.registerMetadata('Rearrival', {
                     columns: 'protocol,title'
                 },
             },
+            attachmentFile: {
+                columnConfig: {
+                    width: 150
+                }
+            },
         }
     }
 });
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCArrivalFormSection.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCArrivalFormSection.java
index 73107cc6..088e6cd0 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCArrivalFormSection.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCArrivalFormSection.java
@@ -49,6 +49,10 @@ protected List<FieldKey> getFieldKeys(TableInfo ti)
         keys.add(10, FieldKey.fromString("Id/demographics/gender"));
         keys.add(12, FieldKey.fromString("Id/demographics/geographic_origin"));
 
+        FieldKey attachmentFile = FieldKey.fromString("attachmentFile");
+        if (keys.remove(attachmentFile))
+            keys.add(attachmentFile);
+
         return keys;
     }
 }
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCRearrivalFormSection.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCRearrivalFormSection.java
index fd5728bf..9c66170f 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCRearrivalFormSection.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCRearrivalFormSection.java
@@ -16,7 +16,11 @@
 package org.labkey.nirc_ehr.dataentry.section;
 
 import org.json.JSONObject;
+import org.labkey.api.data.TableInfo;
 import org.labkey.api.ehr.dataentry.DataEntryFormContext;
+import org.labkey.api.query.FieldKey;
+
+import java.util.List;
 
 public class NIRCRearrivalFormSection extends BaseFormSection
 {
@@ -32,4 +36,16 @@ public JSONObject toJSON(DataEntryFormContext ctx, boolean includeFormElements)
         json.put("dataDependentCollapseHeader", true);
         return json;
     }
+
+    @Override
+    protected List<FieldKey> getFieldKeys(TableInfo ti)
+    {
+        List<FieldKey> keys = super.getFieldKeys(ti);
+
+        FieldKey attachmentFile = FieldKey.fromString("attachmentFile");
+        if (keys.remove(attachmentFile))
+            keys.add(attachmentFile);
+
+        return keys;
+    }
 }