rearranging tabs and setting correct highlights for sub-views
Merge pull request #47 from gvn/1022645

rearranging tabs and setting correct highlights for sub-views - 1022645