moved hard coded nid from tpl to view
Merge branch 'test' into prod