Tabs redo 2738

Might be some work 'look n feel' tweaking to do, but they're functional and close to production.