Update & Re-Factor Tabs