Added separate matchers for rendering as view and layer