Refactored Player view