Work on delete functionality
Fix some functions
Delete -> Manage