Refactor ActivityWithBus