Added a tabbed controller