Improved delete functionality
Merge branch 'develop' into feature/refactor
Revamped activities.py