Updated to tabbed console