Refactored To Activity Fragment