Show & Edit method fixed