Tab control is now optional