Added Tab view helper
Merge branch 'develop' into user