Tab control upgrade