Tabbed UI
Cleanup + Old method update.