diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.base.styles/ui.less
index 58c1df4..d5c492d 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -184,7 +184,7 @@ input.search {
 
 	h2 {
 		// Clear table of contents and any other floated elements in desktop Minerva.
-		clear: both;
+		clear: left;
 
 		.edit-page {
 			font-size: 1 / @fontSizeH2;
@@ -214,7 +214,6 @@ input.search {
 
 	.mw-parser-output > h2,
 	.section-heading {
-		width: 100%;
 		border-bottom: 1px solid @colorGray14;
 		margin-bottom: @headingMargin;
 
diff --git a/resources/skins.minerva.content.styles/hacks.less b/resources/skins.minerva.content.styles/hacks.less
index fccea42..82bc6ee 100644
--- a/resources/skins.minerva.content.styles/hacks.less
+++ b/resources/skins.minerva.content.styles/hacks.less
@@ -131,7 +131,7 @@ FIXME: Review all of these hacks to see if they still apply.
 	font-size: 0.8em;
 	background-color: @colorGray15;
 	margin-bottom: 1px;
-
+	overflow: hidden;
 	a {
 		color: @colorProgressive;
 	}
diff --git a/resources/skins.minerva.tablet.styles/common.less b/resources/skins.minerva.tablet.styles/common.less
index f3effd0..d8c3cd5 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -30,12 +30,10 @@ A file for css that optimises the Minerva skin on larger devices.
 
 	.toc-mobile {
 		// Reset the rule for mobile mode (but not for .client-nojs)
-		display: block;
+		display: table;
 		visibility: visible;
 		position: relative;
 		font-size: 1.3em;
-		float: left;
-		clear: left;
 		margin: 1em 0;
 		border: solid 1px transparent;
 
diff --git a/skinStyles/mobile.toggle/minerva.less b/skinStyles/mobile.toggle/minerva.less
index 82cbf25..27f12fc 100644
--- a/skinStyles/mobile.toggle/minerva.less
+++ b/skinStyles/mobile.toggle/minerva.less
@@ -3,7 +3,7 @@
 .client-js {
 	.collapsible-heading,
 	.collapsible-block {
-		clear: both;
+		clear: left;
 	}
 
 	.collapsible-heading {
@@ -19,6 +19,7 @@
 
 	.collapsible-block {
 		// bug 41401 - without this content doesn't always take up whole width
-		width: 100%;
+		max-width: 100%;
+		overflow: hidden;
 	}
 }