Refactor naive views to use GCBV