
        Clean up mock view code, support mono views

5b3132e