Refactor view override