A bit more work, playing with tabs.  Not sure how the tab view project type is going to work out as I had trouble editing that.