Fix Deletion/Edit Bug
Impouve View