Refactoring device view