Refactor Vistas