View adapters refactoring