added containment to view mapping
let's use the already defined viewName instead of vc.name