Refactored Activity View