sistemato accorpa + refactor view