diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout
index bd0dc03dfb..2a39dc3908 100644
--- a/lib/layouts/paper.layout
+++ b/lib/layouts/paper.layout
@@ -19,7 +19,12 @@ Style Standard
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
-	HTMLTag               p
+	HTMLStyle
+		div.standard {
+			text-indent: 2em;
+			margin-bottom: 2ex;
+		}
+	EndHTMLStyle
 End
 
 Input stdtitle.inc
diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc
index 7debe974d5..7c47275ca3 100644
--- a/lib/layouts/stdclass.inc
+++ b/lib/layouts/stdclass.inc
@@ -35,7 +35,12 @@ Style Standard
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
-	HTMLTag               p
+	HTMLStyle
+		div.standard {
+			text-indent: 2em;
+			margin-bottom: 2ex;
+		}
+	EndHTMLStyle
 End
 
 #Input stdcharstyles.inc
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index bd384cdfec..ccca87b7aa 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -77,9 +77,9 @@ InsetLayout Marginal
 	EndFont
 	MultiPar              true
 	NeedProtect           true
-	HTMLTag               span
+	HTMLTag               div
 	HTMLStyle
-		span.marginal {
+		div.marginal {
 			border: 2px solid black; 
 			padding: 1ex; 
 			margin: 1ex; 
@@ -107,9 +107,9 @@ InsetLayout Foot
 	  Size                Small
 	EndFont
 	MultiPar              true
-	HTMLTag               span
+	HTMLTag               div
 	HTMLLabel             \arabic{footnote}
-	HTMLInnerTag          span
+	HTMLInnerTag          div
 	HTMLStyle
 		span.foot_label {
 			vertical-align: super;
@@ -117,10 +117,10 @@ InsetLayout Foot
 			font-weight: bold;
 			text-decoration: underline;
 		}
-		span.foot_inner {
+		div.foot_inner {
 			display: none;
 		}
-		span.foot:hover span.foot_inner { 
+		div.foot:hover div.foot_inner { 
 			display: block; 
 			border: 1px double black; 
 			margin: 0em 1em;
@@ -154,6 +154,7 @@ InsetLayout Note:Note
 	  Size                Small
 	EndFont
 	MultiPar              true
+	HTMLTag               div
 	HTMLIsBlock           false
 # FIXME HTML Need CSS
 End
@@ -169,7 +170,6 @@ InsetLayout Note:Greyedout
 	  Size                Small
 	EndFont
 	MultiPar              true
-	HTMLTag               span
 	HTMLStyle
 		span.note_greyedout { 
 			background-color: #A0A0A0; 
@@ -177,6 +177,7 @@ InsetLayout Note:Greyedout
 			padding-right: 1ex;
 		}
 	EndHTMLStyle
+	HTMLTag               div
 	HTMLIsBlock           false
 End