Fixed bug with editEntryNotes.

Also re-adds the cancel button. I didn't know you could tell when cancel
was pressed versus sending an empty text box.