fixed conflicts
renamed tabbed to tabbed_standalone