Minor changes (Edit and Delete added)