Revert "Revert "Refatoração da Tela""

This reverts commit 16c545a0517fa8fbc484d0b17bb4c0b455073461.