Removed unused import
Added action bar modes on long click to the add/edit view
Removed expandable lists and replaced with dialogs to add/edit. No bugs remaining on edit/view screens I believe