diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html
index 719d90e7f9..e4e7cb0b1c 100644
--- a/src/app/send/add-edit.component.html
+++ b/src/app/send/add-edit.component.html
@@ -67,7 +67,7 @@
                         </select>
                         <div class="subtext">{{'deletionDateDesc' | i18n}}</div>
                     </div>
-                    <div class="box-content-row" *ngIf="deletionDateSelect === 0">
+                    <div class="box-content-row" *ngIf="deletionDateSelect === 0 && !editMode">
                         <input id="deletionDateCustom" type="datetime-local" name="deletionDate" 
                             [(ngModel)]="deletionDate" required placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
                     </div>
@@ -80,7 +80,7 @@
                         </select>
                         <div class="subtext">{{'expirationDateDesc' | i18n}}</div>
                     </div>
-                    <div class="box-content-row" *ngIf="expirationDateSelect === 0">
+                    <div class="box-content-row" *ngIf="expirationDateSelect === 0 && !editMode">
                         <input id="expirationDateCustom" type="datetime-local" name="expirationDate" 
                             [(ngModel)]="expirationDate" required placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
                     </div>
diff --git a/src/app/send/add-edit.component.ts b/src/app/send/add-edit.component.ts
index e657bcd9c2..982f74c9eb 100644
--- a/src/app/send/add-edit.component.ts
+++ b/src/app/send/add-edit.component.ts
@@ -26,11 +26,10 @@ export class AddEditComponent extends BaseAddEditComponent {
     }
 
     async refresh() {
+        this.password = null;
         const send = await this.loadSend();
         this.send = await send.decrypt();
-
         this.hasPassword = this.send.password != null && this.send.password.trim() !== '';
-
         this.deletionDate = this.dateToString(this.send.deletionDate);
         this.expirationDate = this.dateToString(this.send.expirationDate);
     }
diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html
index ab7b419dec..a87f6394ac 100644
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -43,7 +43,7 @@
                 [infiniteScrollContainer]="'#items .content'" [fromRoot]="true" (scrolled)="loadMore()">
                 <a *ngFor="let s of filteredSends" appStopClick (click)="selectSend(s.id)"
                     href="#" title="{{'viewItem' | i18n}}"
-                    [ngClass]="{'active': s.id === activeSendId}">
+                    [ngClass]="{'active': s.id === sendId}">
                     <div class="icon" aria-hidden="true">
                         <i class="fa fa-fw fa-lg" [ngClass]="s.type == 0 ? 'fa-file-o' : 'fa-file-text-o'"></i>
                     </div>
@@ -68,7 +68,7 @@
         </div>
     </div>
     <app-send-add-edit id="addEdit" class="details" *ngIf="action == 'add' || action == 'edit'" [sendId]="sendId" [type]="selectedSendType" 
-        (onSavedSend)="refresh()" (onCancelled)="cancel()"></app-send-add-edit>
+        (onSavedSend)="savedSend($event)" (onCancelled)="cancel($event)" (onDeletedSend)="deletedSend($event)"></app-send-add-edit>
     <div class="logo" *ngIf="!action">
         <div class="content">
             <div class="inner-content">
diff --git a/src/app/send/send.component.ts b/src/app/send/send.component.ts
index 1463a65b78..b7aa51469f 100644
--- a/src/app/send/send.component.ts
+++ b/src/app/send/send.component.ts
@@ -91,8 +91,20 @@ export class SendComponent extends BaseSendComponent implements OnInit, OnDestro
         this.sendId = null;
     }
 
+    async deletedSend(s: SendView) {
+        await this.refresh();
+        this.action = Action.None;
+        this.sendId = null;
+    }
+
+    async savedSend(s: SendView) {
+        console.log(s);
+        await this.refresh();
+        this.selectSend(s.id);
+    }
+
     async selectSend(sendId: string) {
-        if (sendId === this.sendId) {
+        if (sendId === this.sendId && this.action === Action.Edit) {
             return;
         }
         this.action = Action.Edit;
diff --git a/src/scss/box.scss b/src/scss/box.scss
index 1b17e51a04..ae0c3174f4 100644
--- a/src/scss/box.scss
+++ b/src/scss/box.scss
@@ -102,7 +102,7 @@
     &:hover, &:focus, &.active {
         @include themify($themes) {
             background-color: themed('boxBackgroundHoverColor');
-            textarea {
+            > * {
                 background-color: themed('boxBackgroundHoverColor');
             }
         }
@@ -169,7 +169,7 @@
     &.box-content-row-multi {
         width: 100%;
 
-        input:not([type="checkbox"]):not([type="checkbox"]) {
+        input:not([type="checkbox"]):not([type="radio"]) {
             width: 100%;
         }
 
@@ -251,8 +251,8 @@
     }
 
     &.box-content-row-radio {
-       display: grid; 
-       grid-template-columns: 1fr;
+       display: flex; 
+       flex-direction: column;
        .item {
            display: flex;
            flex: 1;