Little chages

Edit, Delete from View Option..
Merge branch 'MDI2'