Merged in new tab controllers