View Refactor + File View