Started Edit and Delete Activity

Misc Fixes and cleanup as well.
Will finish implementing Edit/Delete tomorrow.