restore from Android Studio
Fix issue with delete dialog
Finished first iteration