WIP

Restructure tabset and tabs.
beginnings of uri bar.