More work on Edit Entry.