integrate view
updates
fixed formatting for profile tabs
commit before merging with LuTao
Merge branch 'Lu-Tao'