Refactor view to use decorator