Fixed edit mode.  Working on view mode.