diff --git a/LNPopupController/LNPopupController/Private/LNPopupController.h b/LNPopupController/LNPopupController/Private/LNPopupController.h
index f183052..5f2ff64 100644
--- a/LNPopupController/LNPopupController/Private/LNPopupController.h
+++ b/LNPopupController/LNPopupController/Private/LNPopupController.h
@@ -11,12 +11,13 @@
 #import "UIViewController+LNPopupSupportPrivate.h"
 #import <LNPopupController/LNPopupCloseButton.h>
 #import "LNPopupContentView+Private.h"
+#import "LNPopupBar+Private.h"
 
 CF_EXTERN_C_BEGIN
 
 #define _LNPopupPresentationStateTransitioning ((LNPopupPresentationState)2)
 
-@interface LNPopupController : NSObject
+@interface LNPopupController : NSObject <_LNPopupBarDelegate>
 
 - (instancetype)initWithContainerViewController:(__kindof UIViewController*)containerController;
 
@@ -24,6 +25,7 @@ CF_EXTERN_C_BEGIN
 
 @property (nonatomic, strong) LNPopupBar* popupBar;
 @property (nonatomic, strong, readonly) LNPopupBar* popupBarStorage;
+@property (nonatomic, strong, readonly) LNPopupBar* popupBarNoCreate;
 @property (nonatomic, strong) LNPopupContentView* popupContentView;
 @property (nonatomic, strong) UIScrollView* popupContentContainerView;
 
diff --git a/LNPopupController/LNPopupController/Private/LNPopupController.mm b/LNPopupController/LNPopupController/Private/LNPopupController.mm
index 7afb31a..4d3fa41 100644
--- a/LNPopupController/LNPopupController/Private/LNPopupController.mm
+++ b/LNPopupController/LNPopupController/Private/LNPopupController.mm
@@ -72,7 +72,7 @@ static BOOL _LNCallDelegateObjectBool(UIViewController* controller, SEL selector
 
 #pragma mark Popup Controller
 
-@interface LNPopupController () <_LNPopupItemDelegate, _LNPopupBarDelegate>
+@interface LNPopupController () <_LNPopupItemDelegate>
 
 - (void)_applicationDidEnterBackground;
 - (void)_applicationWillEnterForeground;
@@ -184,13 +184,12 @@ - (instancetype)initWithContainerViewController:(__kindof UIViewController*)cont
 
 - (CGRect)_frameForOpenPopupBar
 {
-//	CGRect defaultFrame = [_containerController defaultFrameForBottomDockingView_internalOrDeveloper];
 	return CGRectMake(0, - self.popupBar.frame.size.height, _containerController.view.bounds.size.width, self.popupBar.frame.size.height);
 }
 
 - (CGRect)_frameForClosedPopupBar
 {
-	CGRect defaultFrame = [_containerController defaultFrameForBottomDockingView_internalOrDeveloper];
+	CGRect defaultFrame = [_containerController _defaultFrameForBottomDockingViewForPopupBar:_popupBar];
 	UIEdgeInsets insets = [_containerController insetsForBottomDockingView];
 	return CGRectMake(0, defaultFrame.origin.y - self.popupBar.frame.size.height - insets.bottom, _containerController.view.bounds.size.width, self.popupBar.frame.size.height);
 }
@@ -272,7 +271,7 @@ - (void)_setContentToState:(LNPopupPresentationState)state animated:(BOOL)animat
 		targetFrame.size = closedFrame.size;
 	}
 	
-	_cachedDefaultFrame = [_containerController defaultFrameForBottomDockingView_internalOrDeveloper];
+	_cachedDefaultFrame = [_containerController _defaultFrameForBottomDockingViewForPopupBar:_popupBar];
 	_cachedInsets = [_containerController insetsForBottomDockingView];
 	
 	self.popupBar.frame = targetFrame;
@@ -788,7 +787,7 @@ - (void)_popupBarPresentationByUserPanGestureHandler_changed:(UIPanGestureRecogn
 		
 		[self _transitionToState:_LNPopupPresentationStateTransitioning notifyDelegate:YES animated:YES useSpringAnimation:NO allowPopupBarAlphaModification:YES allowFeedbackGeneration:NO forceFeedbackGenerationAtStart:NO completion:nil];
 		
-		_cachedDefaultFrame = [_containerController defaultFrameForBottomDockingView_internalOrDeveloper];
+		_cachedDefaultFrame = [_containerController _defaultFrameForBottomDockingViewForPopupBar:_popupBar];
 		_cachedInsets = [_containerController insetsForBottomDockingView];
 		_cachedOpenPopupFrame = [self _frameForOpenPopupBar];
 		
@@ -1141,7 +1140,7 @@ - (void)_movePopupBarAndContentToBottomBarSuperview
 	}
 }
 
-- (LNPopupBar *)popupBarStorage
+- (LNPopupBar*)popupBarStorage
 {
 	if(_popupBar)
 	{
@@ -1165,7 +1164,12 @@ - (LNPopupBar *)popupBarStorage
 	return _popupBar;
 }
 
-- (LNPopupBar *)popupBar
+- (LNPopupBar*)popupBarNoCreate
+{
+	return _popupBar;
+}
+
+- (LNPopupBar*)popupBar
 {
 	if(_popupControllerInternalState == LNPopupPresentationStateBarHidden)
 	{
@@ -1175,7 +1179,7 @@ - (LNPopupBar *)popupBar
 	return self.popupBarStorage;
 }
 
-- (LNPopupContentView *)popupContentView
+- (LNPopupContentView*)popupContentView
 {
 	if(_popupContentView)
 	{
@@ -1385,7 +1389,7 @@ - (void)_presentPopupBarWithContentViewController:(UIViewController*)contentView
 			
 			[self.popupBar.customBarViewController _userFacing_viewIsAppearing:animated];
 			
-			_LNPopupSupportSetPopupInsetsForViewController(_containerController, YES, UIEdgeInsetsMake(0, 0, barFrame.size.height, 0));
+			_LNPopupSupportSetPopupInsetsForViewController(_containerController, YES, UIEdgeInsetsMake(0, 0, barFrame.size.height - [_containerController _ln_popupOffsetForPopupBarStyle:self.popupBar.resolvedStyle], 0));
 			
 			if(open)
 			{
@@ -1631,7 +1635,7 @@ - (void)_dismissPopupBarAnimated:(BOOL)animated completion:(void(^)(void))comple
 				
 				[self _removeContentControllerFromContentView:_currentContentController];
 				
-				CGRect bottomBarFrame = [_containerController defaultFrameForBottomDockingView_internalOrDeveloper];
+				CGRect bottomBarFrame = [_containerController _defaultFrameForBottomDockingViewForPopupBar:_popupBar];
 				bottomBarFrame.origin.y -= _cachedInsets.bottom;
 				_bottomBar.frame = bottomBarFrame;
 				
@@ -1732,7 +1736,7 @@ - (void)_popupBarMetricsDidChange:(LNPopupBar*)bar
 	barFrame.origin.y -= (barFrame.size.height - currentHeight);
 	self.popupBar.frame = barFrame;
 	
-	_LNPopupSupportSetPopupInsetsForViewController(_containerController, YES, UIEdgeInsetsMake(0, 0, self.popupBar.frame.size.height, 0));
+	_LNPopupSupportSetPopupInsetsForViewController(_containerController, YES, UIEdgeInsetsMake(0, 0, self.popupBar.frame.size.height - [_containerController _ln_popupOffsetForPopupBarStyle:self.popupBar.resolvedStyle], 0));
 }
 
 - (void)_popupBarStyleDidChange:(LNPopupBar*)bar
diff --git a/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupport.mm b/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupport.mm
index 90484eb..b942a67 100644
--- a/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupport.mm
+++ b/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupport.mm
@@ -13,6 +13,7 @@
 #import "_LNPopupSwizzlingUtils.h"
 #import "_LNPopupBase64Utils.hh"
 #import "LNMath.h"
+#import "LNPopupBar+Private.h"
 #import <objc/runtime.h>
 
 static const void* _LNPopupItemKey = &_LNPopupItemKey;
@@ -404,6 +405,24 @@ - (CGRect)defaultFrameForBottomDockingView
 	return CGRectZero;
 }
 
+- (CGFloat)_ln_popupOffsetForPopupBarStyle:(LNPopupBarStyle)barStyle
+{
+	if(barStyle != LNPopupBarStyleFloating /*|| UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPhone*/)
+	{
+		return 0.0;
+	}
+	
+	id dockingView = self.bottomDockingViewForPopupBar;
+	
+	if(dockingView != nil && ([dockingView isKindOfClass:UIToolbar.class] || [dockingView isKindOfClass:UITabBar.class]) == NO)
+	{
+		//User docking view, do not offset.
+		return 0.0;
+	}
+	
+	return self.traitCollection.horizontalSizeClass == UIUserInterfaceSizeClassRegular ? 7.0 : 0.0;
+}
+
 - (CGRect)defaultFrameForBottomDockingView_internal
 {
 	CGFloat safeAreaAddition = self.view.safeAreaInsets.bottom - _LNPopupSafeAreas(self).bottom;
@@ -416,9 +435,13 @@ - (CGRect)defaultFrameForBottomDockingView_internal
 	return CGRectMake(0, self.view.bounds.size.height - safeAreaAddition, self.view.bounds.size.width, safeAreaAddition);
 }
 
-- (CGRect)defaultFrameForBottomDockingView_internalOrDeveloper
+- (CGRect)_defaultFrameForBottomDockingViewForPopupBar:(LNPopupBar*)popupBar
 {
-	return [self bottomDockingViewForPopupBar] != nil ? [self defaultFrameForBottomDockingView] : [self defaultFrameForBottomDockingView_internal];
+	LNPopupBarStyle barStyle = popupBar != nil ? popupBar.resolvedStyle : _LNPopupResolveBarStyleFromBarStyle(LNPopupBarStyleDefault);
+	
+	CGRect rv = [self bottomDockingViewForPopupBar] != nil ? [self defaultFrameForBottomDockingView] : [self defaultFrameForBottomDockingView_internal];
+	rv.origin.y += [self _ln_popupOffsetForPopupBarStyle:barStyle];
+	return rv;
 }
 
 - (BOOL)shouldExtendPopupBarUnderSafeArea
diff --git a/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.h b/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.h
index 510ec0d..bf2cc46 100644
--- a/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.h
+++ b/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.h
@@ -63,8 +63,10 @@ void _LNPopupSupportSetPopupInsetsForViewController(UIViewController* controller
 - (nullable UIView *)bottomDockingViewForPopup_nocreateOrDeveloper;
 - (nonnull UIView *)bottomDockingViewForPopup_internalOrDeveloper;
 
+- (CGFloat)_ln_popupOffsetForPopupBarStyle:(LNPopupBarStyle)barStyle;
+
 - (CGRect)defaultFrameForBottomDockingView_internal;
-- (CGRect)defaultFrameForBottomDockingView_internalOrDeveloper;
+- (CGRect)_defaultFrameForBottomDockingViewForPopupBar:(LNPopupBar*)LNPopupBar;
 
 - (_LNPopupBarBackgroundView*)_ln_bottomBarExtension_nocreate;
 - (_LNPopupBarBackgroundView*)_ln_bottomBarExtension;
diff --git a/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm b/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm
index dedc2e1..d5bfc0a 100644
--- a/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm
+++ b/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm
@@ -298,7 +298,7 @@ - (BOOL)_ln_isModalInPresentation
 - (BOOL)_ln_isObjectFromSwiftUI
 {
 	static NSString* key = LNPopupHiddenString("_isFromSwiftUI");
-	return [self.class respondsToSelector:NSSelectorFromString(key)] && [self.class valueForKey:key];
+	return [self.class respondsToSelector:NSSelectorFromString(key)] && [[self.class valueForKey:key] boolValue];
 }
 
 - (void)_ln_popup_setOverrideUserInterfaceStyle:(UIUserInterfaceStyle)overrideUserInterfaceStyle
@@ -796,7 +796,7 @@ - (void)_ln_popup_viewDidLayoutSubviews
 	{
 		if(self.bottomDockingViewForPopup_nocreateOrDeveloper == self._ln_bottomBarSupport_nocreate)
 		{
-			self._ln_bottomBarSupport_nocreate.frame = self.defaultFrameForBottomDockingView_internalOrDeveloper;
+			self._ln_bottomBarSupport_nocreate.frame = [self _defaultFrameForBottomDockingViewForPopupBar:self._ln_popupController_nocreate.popupBar];
 			[self.view bringSubviewToFront:self._ln_bottomBarSupport_nocreate];
 			
 			self._ln_bottomBarExtension.frame = self._ln_bottomBarSupport_nocreate.frame;
@@ -820,6 +820,19 @@ - (void)_ln_popup_viewDidLayoutSubviews
 		{
 			[self _layoutPopupBarOrderForUse];
 		}
+		
+		if(self._ln_popupController_nocreate.popupControllerInternalState != LNPopupPresentationStateBarHidden)
+		{
+			UIEdgeInsets neededInsets = UIEdgeInsetsMake(0, 0, MAX(0, self.popupBar.frame.size.height - [self _ln_popupOffsetForPopupBarStyle:self.popupBar.resolvedStyle]), 0);
+			
+			UIEdgeInsets safe = _LNPopupSafeAreas(self);
+			UIEdgeInsets childAdditive = _LNPopupChildAdditiveSafeAreas(self);
+			
+			if(neededInsets.bottom != MAX(safe.bottom, childAdditive.bottom))
+			{
+				_LNPopupSupportSetPopupInsetsForViewController(self, YES, neededInsets);
+			}
+		}
 	}
 	
 	UIView* extensionView = self._ln_bottomBarExtension_nocreate;
@@ -1015,6 +1028,11 @@ - (UIEdgeInsets)insetsForBottomDockingView
 	return self.tabBar.hidden == NO && self._isTabBarHiddenDuringTransition == NO ? UIEdgeInsetsZero : self.view.superview.safeAreaInsets;
 }
 
+- (CGFloat)_ln_popupOffsetForPopupBarStyle:(LNPopupBarStyle)barStyle
+{
+	return self._isTabBarHiddenDuringTransition ? [super _ln_popupOffsetForPopupBarStyle:barStyle] : 0;
+}
+
 - (CGRect)defaultFrameForBottomDockingView
 {
 	CGRect bottomBarFrame = self.tabBar.frame;
@@ -1420,6 +1438,7 @@ - (void)hBWT:(NSInteger)transition iE:(BOOL)isExplicit d:(NSTimeInterval)duratio
 		self._ln_bottomBarExtension_nocreate.frame = CGRectMake(0, self.view.bounds.size.height - bottomSafeArea, self.view.bounds.size.width, bottomSafeArea);
 		
 		[self _setIgnoringLayoutDuringTransition:NO];
+		[self._ln_popupController_nocreate _popupBarMetricsDidChange:self._ln_popupController_nocreate.popupBar];
 		[self._ln_popupController_nocreate _setContentToState:self._ln_popupController_nocreate.popupControllerInternalState];
 		
 		self._ln_popupController_nocreate.popupBar.bottomShadowView.hidden = YES;
@@ -1593,6 +1612,7 @@ - (void)sBWT:(NSInteger)transition iE:(BOOL)isExplicit d:(NSTimeInterval)duratio
 		
 		self._ln_popupController_nocreate.popupBar.bottomShadowView.hidden = YES;
 		self._ln_popupController_nocreate.popupBar.bottomShadowView.alpha = 1.0;
+		[self._ln_popupController_nocreate _popupBarMetricsDidChange:self._ln_popupController_nocreate.popupBar];
 		[self._ln_popupController_nocreate _setContentToState:self._ln_popupController_nocreate.popupControllerInternalState];
 		
 		[self _layoutPopupBarOrderForUse];
@@ -1669,6 +1689,11 @@ - (nullable UIView *)bottomDockingViewForPopupBar
 	return self.toolbar;
 }
 
+- (CGFloat)_ln_popupOffsetForPopupBarStyle:(LNPopupBarStyle)barStyle
+{
+	return self.isToolbarHidden ? [super _ln_popupOffsetForPopupBarStyle:barStyle] : 0;
+}
+
 - (CGRect)defaultFrameForBottomDockingView
 {
 	CGRect toolbarBarFrame = self.toolbar.frame;
@@ -1691,14 +1716,15 @@ - (UIEdgeInsets)insetsForBottomDockingView
 		return UIEdgeInsetsZero;
 	}
 	
-	if(UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad && self.view.superview.safeAreaInsets.bottom > 0 && [self _ln_isObjectFromSwiftUI])
+	CGFloat offset = 0;
+	
+	if(UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad && self.view.superview.safeAreaInsets.bottom > 0 && ([self _ln_isObjectFromSwiftUI] || self.splitViewController != nil))
 	{
-//		NSLog(@"superview: %@ window: %@", @(self.view.superview.safeAreaInsets.bottom), @(self.view.window.safeAreaInsets.bottom));
-//		
 		//Something in SwiftUI reports safe area insets incorrectly on iPadOS. This is a workaround for this issue.
-		return UIEdgeInsetsMake(0, 0, MAX(self.view.superview.safeAreaInsets.bottom, self.view.window.safeAreaInsets.bottom) - 5, 0);
+		offset -= 5;
 	}
-	return UIEdgeInsetsMake(0, 0, MAX(self.view.superview.safeAreaInsets.bottom, self.view.window.safeAreaInsets.bottom), 0);
+	
+	return UIEdgeInsetsMake(0, 0, MAX(self.view.superview.safeAreaInsets.bottom, self.view.window.safeAreaInsets.bottom) + offset, 0);
 }
 
 + (void)load
@@ -1961,6 +1987,7 @@ - (void)_sTH:(BOOL)hidden e:(UIRectEdge)edge d:(NSTimeInterval)duration;
 		[self _layoutPopupBarOrderForTransition];
 		
 		void (^animations)(void) = ^ {
+			[self._ln_popupController_nocreate _popupBarMetricsDidChange:self._ln_popupController_nocreate.popupBar];
 			//During the transition, animate the popup bar and content together with the toolbar transition.
 			[self._ln_popupController_nocreate _setContentToState:self._ln_popupController_nocreate.popupControllerInternalState];
 			
diff --git a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/Base.lproj/Main.storyboard b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/Base.lproj/Main.storyboard
index 8681d0a..6e555d5 100644
--- a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/Base.lproj/Main.storyboard
+++ b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/Base.lproj/Main.storyboard
@@ -114,14 +114,14 @@
                                             </segue>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="splitm" textLabel="Nfv-xp-DFu" style="IBUITableViewCellStyleDefault" id="1Qc-Ql-xyu" customClass="SizeClassGalleryCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="splitg" textLabel="rpx-bu-B1q" style="IBUITableViewCellStyleDefault" id="TtF-bg-cC5" userLabel="splits" customClass="SizeClassGalleryCell">
                                         <rect key="frame" x="20" y="251" width="353" height="43.666667938232422"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Qc-Ql-xyu" id="F2D-0P-sjk">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TtF-bg-cC5" id="QOS-U4-Cmr">
                                             <rect key="frame" x="0.0" y="0.0" width="353" height="43.666667938232422"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Split View Controller (Primary)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" id="Nfv-xp-DFu">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Split View Controller (Sidebar)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" id="rpx-bu-B1q">
                                                     <rect key="frame" x="20" y="0.0" width="313" height="43.666667938232422"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
@@ -131,20 +131,17 @@
                                             </subviews>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <segue destination="NWj-M1-Csm" kind="showDetail" identifier="splitm" id="iD8-2E-cMh">
-                                                <segue key="commit" inheritsFrom="parent" id="SwO-q9-mv7"/>
-                                                <segue key="preview" inheritsFrom="commit" id="ubr-x2-eV2"/>
-                                            </segue>
+                                            <segue destination="syE-JZ-XA1" kind="showDetail" identifier="splits" id="19O-Tx-Ntx"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="splitg" textLabel="rpx-bu-B1q" style="IBUITableViewCellStyleDefault" id="TtF-bg-cC5" userLabel="splits" customClass="SizeClassGalleryCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="splitm" textLabel="Nfv-xp-DFu" style="IBUITableViewCellStyleDefault" id="1Qc-Ql-xyu" customClass="SizeClassGalleryCell">
                                         <rect key="frame" x="20" y="294.66666793823242" width="353" height="43.666667938232422"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TtF-bg-cC5" id="QOS-U4-Cmr">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Qc-Ql-xyu" id="F2D-0P-sjk">
                                             <rect key="frame" x="0.0" y="0.0" width="353" height="43.666667938232422"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Split View Controller (Secondary)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" id="rpx-bu-B1q">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Split View Controller (Primary)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" id="Nfv-xp-DFu">
                                                     <rect key="frame" x="20" y="0.0" width="313" height="43.666667938232422"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
@@ -154,10 +151,7 @@
                                             </subviews>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <segue destination="syE-JZ-XA1" kind="showDetail" identifier="splits" id="19O-Tx-Ntx">
-                                                <segue key="commit" inheritsFrom="parent" id="t7R-kM-r3g"/>
-                                                <segue key="preview" inheritsFrom="commit" id="7fn-D0-hm6"/>
-                                            </segue>
+                                            <segue destination="NWj-M1-Csm" kind="showDetail" identifier="splitm" id="iD8-2E-cMh"/>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="splitg" textLabel="rjJ-Ax-bGN" style="IBUITableViewCellStyleDefault" id="TjV-b9-KIw" userLabel="splita" customClass="SizeClassGalleryCell">
@@ -177,10 +171,7 @@
                                             </subviews>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <segue destination="OMG-ri-qb5" kind="showDetail" identifier="splita" id="ie4-if-ZuB">
-                                                <segue key="commit" inheritsFrom="parent" id="5pE-ej-gUV"/>
-                                                <segue key="preview" inheritsFrom="commit" id="pb3-Pz-4cU"/>
-                                            </segue>
+                                            <segue destination="OMG-ri-qb5" kind="showDetail" identifier="splita" id="ie4-if-ZuB"/>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="splitg" textLabel="mRf-7b-D7v" style="IBUITableViewCellStyleDefault" id="Z91-wv-EaJ" customClass="SizeClassGalleryCell">
@@ -200,10 +191,7 @@
                                             </subviews>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <segue destination="F0W-R7-jVc" kind="showDetail" identifier="splitg" id="SDh-r0-h83">
-                                                <segue key="commit" inheritsFrom="parent" id="stp-Qs-DKr"/>
-                                                <segue key="preview" inheritsFrom="commit" id="44r-L6-81t"/>
-                                            </segue>
+                                            <segue destination="F0W-R7-jVc" kind="showDetail" identifier="splitg" id="SDh-r0-h83"/>
                                         </connections>
                                     </tableViewCell>
                                 </cells>
@@ -436,7 +424,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="eEz-t1-9Ax" customClass="DemoToolbar">
-                        <rect key="frame" x="0.0" y="769" width="393" height="49"/>
+                        <rect key="frame" x="0.0" y="720" width="393" height="49"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" red="0.91372549020000005" green="0.27058823529999998" blue="0.34901960780000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </toolbar>
@@ -451,11 +439,10 @@
         <!--Split View Controller Secondary Popup-->
         <scene sceneID="KO7-t9-gOw">
             <objects>
-                <splitViewController modalPresentationStyle="fullScreen" preferredDisplayMode="beside" id="syE-JZ-XA1" customClass="LNSplitViewControllerSecondaryPopup" sceneMemberID="viewController">
+                <splitViewController modalPresentationStyle="fullScreen" allowDoubleColumnStyle="YES" primaryBackgroundStyle="sidebar" id="syE-JZ-XA1" customClass="LNSplitViewControllerSecondaryPopup" sceneMemberID="viewController">
                     <connections>
                         <segue destination="GHH-ob-Ng8" kind="relationship" relationship="masterViewController" id="T58-y9-xu1"/>
                         <segue destination="l54-z5-xcG" kind="relationship" relationship="detailViewController" id="3nI-aH-Ed7"/>
-                        <segue destination="GHH-ob-Ng8" kind="relationship" relationship="supplementaryViewController" id="Sl0-uM-xPB"/>
                     </connections>
                 </splitViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4h9-v3-mHk" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -479,7 +466,7 @@
         <!--Split View Controller Primary Popup-->
         <scene sceneID="0aA-gd-S0Z">
             <objects>
-                <splitViewController modalPresentationStyle="fullScreen" allowDoubleColumnStyle="YES" preferredDisplayMode="beside" id="NWj-M1-Csm" customClass="LNSplitViewControllerPrimaryPopup" sceneMemberID="viewController">
+                <splitViewController modalPresentationStyle="fullScreen" allowDoubleColumnStyle="YES" id="NWj-M1-Csm" customClass="LNSplitViewControllerPrimaryPopup" sceneMemberID="viewController">
                     <connections>
                         <segue destination="GHH-ob-Ng8" kind="relationship" relationship="masterViewController" id="IDA-Po-Fia"/>
                         <segue destination="l54-z5-xcG" kind="relationship" relationship="detailViewController" id="04d-1K-Lzo"/>
@@ -506,7 +493,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="Bottom" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N4q-gh-14d">
-                                <rect key="frame" x="167.33333333333334" y="797.66666666666663" width="58.666666666666657" height="20.333333333333371"/>
+                                <rect key="frame" x="167.33333333333334" y="748.66666666666663" width="58.666666666666657" height="20.333333333333371"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                 <nil key="highlightedColor"/>
                             </label>
@@ -617,8 +604,10 @@
                     <connections>
                         <outlet property="_barStyleButton" destination="Mqv-hY-tWM" id="FZH-Ef-T8y"/>
                         <outlet property="_galleryButton" destination="PfZ-Ec-LGF" id="THI-bP-GnE"/>
+                        <outlet property="_hidePopupBarButton" destination="q0Y-mo-S4A" id="lK5-Vi-OpV"/>
                         <outlet property="_hideTabBarButton" destination="V13-KE-dTv" id="NDX-P9-gwv"/>
                         <outlet property="_nextButton" destination="DxD-7y-6Na" id="zDA-Ko-tDF"/>
+                        <outlet property="_showPopupBarButton" destination="cfk-zq-tnF" id="VLT-OR-cxH"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Q0v-GP-COM" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -762,18 +751,14 @@
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="ie4-if-ZuB"/>
-        <segue reference="gRd-L2-CDS"/>
+        <segue reference="Te4-2y-lMK"/>
         <segue reference="vYe-8f-bz7"/>
         <segue reference="08s-5F-WiR"/>
         <segue reference="7V8-5m-eAW"/>
         <segue reference="SIC-fE-4sh"/>
-        <segue reference="Qc4-nZ-cyX"/>
+        <segue reference="7qJ-pK-ibQ"/>
         <segue reference="1U6-NV-9t4"/>
-        <segue reference="iD8-2E-cMh"/>
-        <segue reference="SDh-r0-h83"/>
-        <segue reference="19O-Tx-Ntx"/>
-        <segue reference="IDA-Po-Fia"/>
+        <segue reference="gSl-m3-ZVG"/>
     </inferredMetricsTieBreakers>
     <color key="tintColor" systemColor="systemPinkColor"/>
     <resources>
diff --git a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/DemoViewController.m b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/DemoViewController.m
index 5ef0991..f7525f6 100644
--- a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/DemoViewController.m
+++ b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/DemoViewController.m
@@ -62,6 +62,9 @@ @implementation DemoViewController
 	__weak IBOutlet UIBarButtonItem *_barStyleButton;
 	__weak IBOutlet UIBarButtonItem *_hideTabBarButton;
 	
+	__weak IBOutlet UIButton* _showPopupBarButton;
+	__weak IBOutlet UIButton* _hidePopupBarButton;
+	
 	BOOL _alreadyPresentedAutomatically;
 }
 
@@ -122,7 +125,10 @@ - (void)viewDidLoad
 	{
 		if(self.splitViewController != nil)
 		{
-			self.colorSeedString = [NSString stringWithFormat:@"%@", @(arc4random())];
+			UIViewController* indexTarget = self.tabBarController ?: self.navigationController ?: self;
+			NSInteger idx = 1 - [self.splitViewController.viewControllers indexOfObject:indexTarget];
+			
+			self.colorSeedString = [NSString stringWithFormat:@"split_%@_%@%@ccolors", NSStringFromClass(self.splitViewController.class), @(idx), @(idx)];
 		}
 		else if(self.tabBarController != nil)
 		{
@@ -320,8 +326,28 @@ - (void)updateBottomDockingViewEffectForBarPresentation
 
 - (UIViewController*)_targetVCForPopup
 {
+	void (^block)(NSString*) = ^ (NSString* title) {
+		self->_hideTabBarButton.enabled = NO;
+		if (@available(iOS 16.0, *))
+		{
+			self->_hideTabBarButton.hidden = YES;
+		}
+		self->_showPopupBarButton.hidden = YES;
+		self->_hidePopupBarButton.hidden = YES;
+		[self.navigationController setToolbarHidden:YES animated:NO];
+		
+		if (@available(iOS 17.0, *))
+		{
+			UIContentUnavailableConfiguration* config = [UIContentUnavailableConfiguration emptyConfiguration];
+			config.text = title;
+			[self setContentUnavailableConfiguration:config];
+		}
+	};
+	
 	if([self.splitViewController isKindOfClass:LNSplitViewControllerPrimaryPopup.class] && self.navigationController != [self.splitViewController viewControllerForColumn:UISplitViewControllerColumnPrimary])
 	{
+		self.view.backgroundColor = UIColor.systemBackgroundColor;
+		block(NSLocalizedString(@"Primary", @""));
 		return nil;
 	}
 	
@@ -332,11 +358,9 @@ - (UIViewController*)_targetVCForPopup
 	}
 	if([self.splitViewController isKindOfClass:LNSplitViewControllerSecondaryPopup.class] && [vcs containsObject:[self.splitViewController viewControllerForColumn:UISplitViewControllerColumnPrimary]])
 	{
-		return nil;
-	}
-	
-	if([self.splitViewController isKindOfClass:LNSplitViewControllerSecondaryPopup.class] && [vcs containsObject:[self.splitViewController viewControllerForColumn:UISplitViewControllerColumnSupplementary]])
-	{
+		self.view.backgroundColor = UIColor.clearColor;
+		block(NSLocalizedString(@"Sidebar", @""));
+		
 		return nil;
 	}
 	
diff --git a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/LNSplitViewController.m b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/LNSplitViewController.m
index e048691..58f04f5 100644
--- a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/LNSplitViewController.m
+++ b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/LNSplitViewController.m
@@ -14,13 +14,16 @@ - (void)viewDidLoad
 {
 	[super viewDidLoad];
 	
-	self.minimumPrimaryColumnWidth = 400;
-	self.maximumPrimaryColumnWidth = 400;
-	
-	if(self.style == UISplitViewControllerStyleTripleColumn)
+	if([self isKindOfClass:LNSplitViewControllerSecondaryPopup.class] == NO)
 	{
-		self.minimumSupplementaryColumnWidth = 400;
-		self.maximumSupplementaryColumnWidth = 400;
+		self.minimumPrimaryColumnWidth = 400;
+		self.maximumPrimaryColumnWidth = 400;
+		
+		if(self.style == UISplitViewControllerStyleTripleColumn)
+		{
+			self.minimumSupplementaryColumnWidth = 400;
+			self.maximumSupplementaryColumnWidth = 400;
+		}
 	}
 }