Fix indexing / Added activity deletion