diff --git a/scss/_forms.scss b/scss/_forms.scss
index 9956679c69..1ad310cbd2 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -95,7 +95,7 @@ input.input-large {
 // Typical form groups - `<dl.form>` with a `<dt>` containing the label and
 // `<dd> containing the form elements.
 dl.form {
-  margin: 15px 0;
+  margin: 0 0 15px;
 
   input[type="text"],
   input[type="password"],
@@ -323,7 +323,7 @@ dl.form {
 // For checkboxes and radio button selections.
 .form-checkbox {
   padding-left: 20px;
-  margin: 15px 0;
+  margin-bottom: 15px;
   vertical-align: middle;
 
   label {
diff --git a/scss/_type.scss b/scss/_type.scss
index dc065d8f52..8d1c9a2238 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -7,9 +7,9 @@ h3,
 h4,
 h5,
 h6 {
-  margin-top: 15px;
-  margin-bottom: 15px;
-  line-height: 1.1;
+  margin-top: 0;
+  margin-bottom: 0;
+  line-height: 1.5;
 }
 
 h1 { font-size: 30px; }
@@ -23,6 +23,11 @@ h6 { font-size: 11px; }
 // Body text
 // --------------------------------------------------
 
+p {
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+
 small {
   font-size: 90%;
 }
@@ -49,7 +54,7 @@ blockquote {
 
 ul,
 ol {
-  padding: 0;
+  padding-left: 0;
   margin-top: 0;
   margin-bottom: 0;
 }