Added buttons for delete
minor changes in popup window