Do refactor on previous commit to include a fragment activity