Osra197 show view on cancel edit

Rebased on AgileVentures:develop specs and edit overrides to allow returning to show view on edit.
Please revert these changes.