FarmView refactoring