View refactoring including Draper gem