Refactor and ensure all events controlled by /activities