Fixed deletion
Merged delete changes
Fix cancel button not working from list screen