CHG: Cleaned up the TCA and backported the localization view from master