diff --git a/website/source/docs/enterprise/api/configuration-versions.html.md b/website/source/docs/enterprise/api/configuration-versions.html.md
index 9c737a811..b4804bd93 100755
--- a/website/source/docs/enterprise/api/configuration-versions.html.md
+++ b/website/source/docs/enterprise/api/configuration-versions.html.md
@@ -17,7 +17,7 @@ to include the necessary variables for the Terraform configuration.
 
 ### Configuration Version Attributes
 
-<table border="1" cellspaceing="5">
+<table class="apidocs">
   <tr>
     <th>Attribute</th>
     <th>Description</th>
diff --git a/website/source/docs/enterprise/api/configurations.html.md b/website/source/docs/enterprise/api/configurations.html.md
index ee8cdfd9f..0bfd29a9e 100755
--- a/website/source/docs/enterprise/api/configurations.html.md
+++ b/website/source/docs/enterprise/api/configurations.html.md
@@ -11,13 +11,13 @@ description: |-
 A configuration respresents settings associated with a resource that
 runs Terraform with versions of Terraform configuration.
 
-Configurations have many [configuration versions](/help/api/terraform/configuration-versions)
+Configurations have many [configuration versions](/docs/enterprise/api/configuration-versions.html)
 which represent versions of Terraform configuration templates and other associated
 configuration.
 
 ### Configuration Attributes
 
-<table border="1" cellspaceing="5">
+<table class="apidocs">
   <tr>
     <th>Attribute</th>
     <th>Description</th>
diff --git a/website/source/docs/enterprise/api/environments.html.md b/website/source/docs/enterprise/api/environments.html.md
index e322e5634..8c3fe3b92 100755
--- a/website/source/docs/enterprise/api/environments.html.md
+++ b/website/source/docs/enterprise/api/environments.html.md
@@ -15,7 +15,7 @@ This documentation covers the environment interactions with Terraform.
 
 ### Environment Attributes
 
-<table border="1" cellspaceing="5">
+<table class="apidocs">
   <tr>
     <th>Attribute</th>
     <th>Description</th>
@@ -29,7 +29,7 @@ This documentation covers the environment interactions with Terraform.
     <td>Yes</td>
   </tr>
 </table>
-
+<br>
 <div class="alert-infos">
   <div class="row alert-info">
     Note: Only string variables can be updated via the API currently.
diff --git a/website/source/docs/enterprise/api/runs.html.md b/website/source/docs/enterprise/api/runs.html.md
index 7a461ce03..43ec3f1a1 100755
--- a/website/source/docs/enterprise/api/runs.html.md
+++ b/website/source/docs/enterprise/api/runs.html.md
@@ -16,7 +16,7 @@ can be configured to auto-apply to avoid this.
 
 ### Run Attributes
 
-<table border="1" cellspaceing="5">
+<table class="apidocs">
   <tr>
     <th>Attribute</th>
     <th>Description</th>
diff --git a/website/source/docs/enterprise/api/states.html.md b/website/source/docs/enterprise/api/states.html.md
index 6a54d9175..7760a1ca5 100755
--- a/website/source/docs/enterprise/api/states.html.md
+++ b/website/source/docs/enterprise/api/states.html.md
@@ -12,7 +12,7 @@ State represents the status of your infrastructure at the last time Terraform wa
 
 ### State Attributes
 
-<table border="1" cellspaceing="5">
+<table class="apidocs">
   <tr>
     <th>Attribute</th>
     <th>Description</th>
diff --git a/website/source/docs/enterprise/api/users.html.md b/website/source/docs/enterprise/api/users.html.md
index f6d771753..e72ea5e3a 100755
--- a/website/source/docs/enterprise/api/users.html.md
+++ b/website/source/docs/enterprise/api/users.html.md
@@ -12,7 +12,7 @@ Users are both users and organizations in Terraform Enterprise. They are the
 parent resource of all resources.
 
 Currently, only the retrieval of users is avaiable on the API. Additionally,
-only [box](/help/api/vagrant/boxes) resources will be listed. Boxes will
+only Vagrant box resources will be listed. Boxes will
 be returned based on permissions over the organization, or user.
 
 ### Actions
diff --git a/website/source/docs/enterprise/billing/index.html.md b/website/source/docs/enterprise/billing/index.html.md
index 25ba5a99e..3cd8c37db 100755
--- a/website/source/docs/enterprise/billing/index.html.md
+++ b/website/source/docs/enterprise/billing/index.html.md
@@ -24,24 +24,89 @@ determined by a property of the resource. The `count` meta-parameter is used
 for all compute resource types. The complete list of compute resources and
 resource arguments for determining managed node count is below.
 
-| Provider | Resource Type | Resource Property |
-|:-:|:-:|:-:|
-| AWS | `aws_instance` | `count` |
-| AWS | `aws_autoscaling_group` | `count` `desired_capacity` |
-| Azure | `azure_instance` | `count` |
-| Azure | `azurerm_virtual_machine` | `count` |
-| CenturyLink Cloud | `clc_server` | `count` |
-| CloudStack | `cloudstack_instance` | `count` |
-| DigitalOcean | `digitalocean_droplet` | `count` |
-| Google Cloud | `google_compute_instance` | `count` |
-| Google Cloud | `compute_instance_group_manager` | `count` `target_size` |
-| Heroku | `heroku_app` | `count` |
-| OpenStack | `openstack_compute_instance_v2` | `count` |
-| Packet | `packet_device` | `count` |
-| Triton | `triton_machine` | `count` |
-| VMware vCloud Director | `vcd_vapp` | `count` |
-| VMware vSphere provider | `vsphere_virtual_machine` | `count` |
-
+<table class="apidocs">
+  <tr>
+    <th>Provider</th>
+    <th>Resource Type</th>
+    <th>Resource Property</th>
+  </tr>
+  </tr>
+  <tr>
+    <td>AWS</td>
+    <td>`aws_instance`</td>
+    <td>`count`</td>
+  </tr>
+  <tr>    
+    <td>AWS 
+    <td>`aws_autoscaling_group`</td>
+    <td>`count` `desired_capacity`</td>
+  </tr>
+  <tr>    
+    <td>Azure</td> 
+    <td>`azure_instance`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>
+    <td>Azure</td> 
+    <td>`azurerm_virtual_machine`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>    
+    <td>CenturyLink Cloud</td> 
+    <td>`clc_server`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr> 
+    <td>CloudStack</td> 
+    <td>`cloudstack_instance`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr> 
+    <td>DigitalOcean</td> 
+    <td>`digitalocean_droplet`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>  
+    <td>Google Cloud</td> 
+    <td>`google_compute_instance`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>
+    <td>Google Cloud</td> 
+    <td>`compute_instance_group_manager`</td> 
+    <td>`count` `target_size`</td>
+  </tr>
+  <tr>  
+    <td>Heroku</td> 
+    <td>`heroku_app`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>
+    <td>OpenStack</td> 
+    <td>`openstack_compute_instance_v2`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>
+    <td>Packet</td> 
+    <td>`packet_device`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>
+    <td>Triton</td> 
+    <td>`triton_machine`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>
+    <td>VMware vCloud Director</td> 
+    <td>`vcd_vapp`</td> 
+    <td>`count`</td>
+  </tr>
+  <tr>
+    <td>VMware vSphere provider</td> 
+    <td>`vsphere_virtual_machine`</td> 
+    <td>`count`</td>
+  </tr>
+</table>
 
 Terraform Enterprise includes unlimited Packer builds and artifact storage.
 
diff --git a/website/source/docs/enterprise/faq/index.html.md b/website/source/docs/enterprise/faq/index.html.md
index b0d037cae..8d548fcfa 100755
--- a/website/source/docs/enterprise/faq/index.html.md
+++ b/website/source/docs/enterprise/faq/index.html.md
@@ -8,6 +8,6 @@ description: |-
 
 # Frequently Asked Questions
 
-[Monolithic Artifacts](/docs/enterprise/faq/monolithic-artifacts) - *How do I build multiple applications into one artifact?*
+[Monolithic Artifacts](/docs/enterprise/faq/monolithic-artifacts.html) - *How do I build multiple applications into one artifact?*
 
-[Rolling Deployments](/docs/enterprise/faq/rolling-deployments) - *How do I configure rolling deployments?*
+[Rolling Deployments](/docs/enterprise/faq/rolling-deployments.html) - *How do I configure rolling deployments?*
diff --git a/website/source/docs/enterprise/organizations/authentication-policy.html.md b/website/source/docs/enterprise/organizations/authentication-policy.html.md
index 32bfbf1f6..66c572848 100755
--- a/website/source/docs/enterprise/organizations/authentication-policy.html.md
+++ b/website/source/docs/enterprise/organizations/authentication-policy.html.md
@@ -13,7 +13,7 @@ Because organization membership affords members access to potentially sensitive
 
 ## Requiring Two-Factor Authentication
 
-Organization owners can require that all organization team members use [two-factor authentication](/docs/enterprise/user-accounts/authentication). Those that lack two-factor authentication will be locked out of the web interface until they enable it or leave the organization.
+Organization owners can require that all organization team members use [two-factor authentication](/docs/enterprise/user-accounts/authentication.html). Those that lack two-factor authentication will be locked out of the web interface until they enable it or leave the organization.
 
 Visit your organization's configuration page to enable this feature. All organization owners must have two-factor authentication enabled to require the practice organization-wide. Note: locked-out users are still be able to interact with Terraform Enterprise using their `ATLAS_TOKEN`.
 
diff --git a/website/source/docs/enterprise/runs/notifications.html.md b/website/source/docs/enterprise/runs/notifications.html.md
index 677e2474e..f7e52e9e2 100755
--- a/website/source/docs/enterprise/runs/notifications.html.md
+++ b/website/source/docs/enterprise/runs/notifications.html.md
@@ -9,9 +9,7 @@ description: |-
 
 # Terraform Run Notifications
 
-Terraform Enterprise can send run notifications to your organization via one of our [supported
-notification methods](https://atlas.hashicorp.com/help/consul/alerts/notification-methods). The following
-events are configurable:
+Terraform Enterprise can send run notifications, the following events are configurable:
 
 - **Needs Confirmation** - The plan phase has succeeded, and there are changes
   that need to be confirmed before applying.
diff --git a/website/source/docs/enterprise/runs/starting.html.md b/website/source/docs/enterprise/runs/starting.html.md
index 032291904..b2796121a 100755
--- a/website/source/docs/enterprise/runs/starting.html.md
+++ b/website/source/docs/enterprise/runs/starting.html.md
@@ -97,7 +97,7 @@ artifact named "worker":
     }
 
 When a new version of the and artifact "worker" is uploaded either manually
-or as the output of a [Packer build](https://atlas.hashicorp.com/help/packer/builds/starting), a Terraform plan can be automatically triggered with this new artifact version.
+or as the output of a [Packer build](/docs/enterprise/packer/builds/starting.html), a Terraform plan can be automatically triggered with this new artifact version.
 You can enable this feature on a per-environment basis from the
 environment settings page.
 
diff --git a/website/source/docs/enterprise/state/collaborating.html.md b/website/source/docs/enterprise/state/collaborating.html.md
index 9130de266..96a24f547 100755
--- a/website/source/docs/enterprise/state/collaborating.html.md
+++ b/website/source/docs/enterprise/state/collaborating.html.md
@@ -14,7 +14,7 @@ Remote state gives you the ability to version and collaborate on Terraform chang
 stores information about the changes Terraform makes based on configuration.
 
 In order to collaborate safely on remote state, we recommend
-[creating an organization](https://atlas.hashicorp.com/help/organizations/create) to manage teams of users.
+[creating an organization](/docs/enterprise/organizations/create.html) to manage teams of users.
 
 Then, following a [remote state push](/docs/enterprise/state) you can view state versions
 in the changes tab of the environment created under the same name
diff --git a/website/source/docs/enterprise/support.html.md b/website/source/docs/enterprise/support.html.md
new file mode 100755
index 000000000..9a6918aeb
--- /dev/null
+++ b/website/source/docs/enterprise/support.html.md
@@ -0,0 +1,38 @@
+---
+layout: "docs"
+page_title: "Contacting Support"
+sidebar_current: "docs-enterprise-support"
+description: |-
+  All users of Terraform Enterprise are urged to email feedback, questions or requests to the HashiCorp team.
+---
+
+# Contacting Support
+
+All users of Terraform Enterprise are urged to email feedback, questions or requests
+to the HashiCorp team.
+
+### [support@hashicorp.com](mailto:support@hashicorp.com)
+
+We do not currently publish support SLAs for free accounts, but endeavour
+to respond as quickly as possible. We respond to most requests
+within less than 24 hours.
+
+## HashiCorp Tools Support
+
+It's often the case that Terraform Enterprise questions or feedback relates to the
+HashiCorp tooling. We encourage all Terraform Enterpriseusers to search for related
+issues and problems in the open source repositories and mailing lists
+prior to contacting us to help make our support more efficient and
+to help resolve problems faster.
+
+Visit the updating tools section
+for a list of our tools and their project websites.
+
+## Documentation Feedback
+
+Due to the dynamic nature of Terraform Enterprise and the broad set of features
+it provides, there may be information lacking in the documentation.
+
+In this case, we appreciate any feedback to be emailed to us so
+we can make improvements. Please email feedback to
+<a href="mailto:support@hashicorp.com">support@hashicorp.com</a>.
diff --git a/website/source/docs/enterprise/vcs/github.html.md b/website/source/docs/enterprise/vcs/github.html.md
index 2baeb9cfe..40778358d 100755
--- a/website/source/docs/enterprise/vcs/github.html.md
+++ b/website/source/docs/enterprise/vcs/github.html.md
@@ -20,8 +20,7 @@ Terraform Enterprise environments are linked to individual GitHub repositories.
 single GitHub repository can be linked to multiple environments allowing
 a single set of Terraform configuration to be used across multiple environments.
 
-Environments can be linked when they're initially created using the
-[New Environment](https://atlas.hashicorp.com/configurations/import) process.
+Environments can be linked when they're initially created using the New Environment process.
 Existing environments can be linked by setting GitHub details in their
 **Integrations**.
 
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 287c15bb3..9753bf667 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -558,15 +558,15 @@
           <li<%= sidebar_current("docs-enterprise-vcs") %>>
             <a href="/docs/enterprise/vcs/index.html">VCS Integration</a>
           </li>
+          <li<%= sidebar_current("docs-enterprise-packer") %>>
+            <a href="/docs/enterprise/packer/index.html">Packer</a>
+          </li>
           <li<%= sidebar_current("docs-enterprise-accounts") %>>
             <a href="/docs/enterprise/user-accounts/index.html">User Accounts</a>
           </li>
           <li<%= sidebar_current("docs-enterprise-organizations") %>>
             <a href="/docs/enterprise/organizations/index.html">Organizations</a>
           </li>
-          <li<%= sidebar_current("docs-enterprise-packer") %>>
-            <a href="/docs/enterprise/packer/index.html">Packer</a>
-          </li>
           <li<%= sidebar_current("docs-enterprise-api") %>>
             <a href="/docs/enterprise/api/index.html">API</a>
           </li>
@@ -579,6 +579,9 @@
           <li<%= sidebar_current("docs-enterprise-faq") %>>
             <a href="/docs/enterprise/faq/index.html">FAQ</a>
           </li>
+          <li<%= sidebar_current("docs-enterprise-support") %>>
+            <a href="/docs/enterprise/support.html">Contact Support</a>
+          </li>
         </ul>
       </li>
     </ul>
diff --git a/website/source/layouts/faq.erb b/website/source/layouts/faq.erb
index c06dd8f84..94dd70ad2 100644
--- a/website/source/layouts/faq.erb
+++ b/website/source/layouts/faq.erb
@@ -7,7 +7,7 @@
 				</li>
 
 				<li<%= sidebar_current(/^docs-enterprise-faq-/) %>>
-					<a href="/docs/enterprise/runs/index.html">FAQ</a>
+					<a href="/docs/enterprise/faq/index.html">FAQ</a>
 					<ul class="nav nav-visible">
 						<li<%= sidebar_current("docs-enterprise-faq-monolithic") %>>
 							<a href="/docs/enterprise/faq/monolithic-artifacts.html">Monolithing Artifacts</a>