More work on the tabbed interface.