Refactor ViewBuilders