Edit Fix

Fixes duplication problems with the edit feature