add wrappers to views
Merge branch 'sb_04_07'