Omandtc 61

Fixed: Confirmation dialog not appears while deleting file
Improved: Merged add & edit view