Cleanup in SettingsTBV, now the segues are working properly