Separator fixes
This prevents navigating to a separator, and prevents another one showing when it shouldn't to avoid a double border.
This prevents navigating to a separator, and prevents another one showing when it shouldn't to avoid a double border.