Frontend - Refactor view