Refactor the Activities

- Refactor the Activities