Refactor Views for errors