Changed basis to tabbed rather than master/detail