added Tabs, bringing all old controls back; new build