More work toward tabbed UI