changes to tabview
and fix of main view
Merge origin/master