Issue #281 Adding show & edit