Replace ActivityWithBus with BaseActivity