Updated to tab view