Revert morning's work and fixed up show and edit views
another try