diff --git a/website/source/docs/providers/aws/d/billing_service_account.markdown b/website/source/docs/providers/aws/d/billing_service_account.html.markdown
similarity index 100%
rename from website/source/docs/providers/aws/d/billing_service_account.markdown
rename to website/source/docs/providers/aws/d/billing_service_account.html.markdown
diff --git a/website/source/docs/providers/aws/d/iam_role.html.markdown b/website/source/docs/providers/aws/d/iam_role.html.markdown
index 85ce81de2..e335fc667 100644
--- a/website/source/docs/providers/aws/d/iam_role.html.markdown
+++ b/website/source/docs/providers/aws/d/iam_role.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "aws"
 page_title: "AWS: aws_iam_role"
-sidebar_current: docs-aws-datasource-iam-role
+sidebar_current: "docs-aws-datasource-iam-role"
 description: |-
   Get information on a Amazon IAM role
 ---
diff --git a/website/source/docs/providers/aws/r/app_cookie_stickiness_policy.html.markdown b/website/source/docs/providers/aws/r/app_cookie_stickiness_policy.html.markdown
index aff29db4c..8184db371 100644
--- a/website/source/docs/providers/aws/r/app_cookie_stickiness_policy.html.markdown
+++ b/website/source/docs/providers/aws/r/app_cookie_stickiness_policy.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "aws"
 page_title: "AWS: aws_app_cookie_stickiness_policy"
-sidebar_current: "docs-aws-app-cookie-stickiness-policy"
+sidebar_current: "docs-aws-resource-app-cookie-stickiness-policy"
 description: |-
   Provides an application cookie stickiness policy, which allows an ELB to wed its stickiness cookie to a cookie generated by your application.
 ---
diff --git a/website/source/docs/providers/aws/r/default_route_table.html.markdown b/website/source/docs/providers/aws/r/default_route_table.html.markdown
index 30a3bc008..fc7ea34ca 100644
--- a/website/source/docs/providers/aws/r/default_route_table.html.markdown
+++ b/website/source/docs/providers/aws/r/default_route_table.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "aws"
 page_title: "AWS: aws_default_route_table"
-sidebar_current: "docs-aws-resource-default-route-table|"
+sidebar_current: "docs-aws-resource-default-route-table"
 description: |-
   Provides a resource to manage a Default VPC Routing Table.
 ---
diff --git a/website/source/docs/providers/aws/r/network_interface_attachment.markdown b/website/source/docs/providers/aws/r/network_interface_attachment.html.markdown
similarity index 100%
rename from website/source/docs/providers/aws/r/network_interface_attachment.markdown
rename to website/source/docs/providers/aws/r/network_interface_attachment.html.markdown
diff --git a/website/source/docs/providers/aws/r/ses_configuration_set.markdown b/website/source/docs/providers/aws/r/ses_configuration_set.markdown
index 9ea3b374e..1b4a0bf3c 100644
--- a/website/source/docs/providers/aws/r/ses_configuration_set.markdown
+++ b/website/source/docs/providers/aws/r/ses_configuration_set.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "aws"
 page_title: "AWS: ses_configuration_set"
-sidebar_current: "docs-aws-resource-ses-configuration_set"
+sidebar_current: "docs-aws-resource-ses-configuration-set"
 description: |-
   Provides an SES configuration set
 ---
diff --git a/website/source/docs/providers/aws/r/spot_datafeed_subscription.html.markdown b/website/source/docs/providers/aws/r/spot_datafeed_subscription.html.markdown
index e1cac15d9..71e2ec7d1 100644
--- a/website/source/docs/providers/aws/r/spot_datafeed_subscription.html.markdown
+++ b/website/source/docs/providers/aws/r/spot_datafeed_subscription.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "aws"
 page_title: "AWS: aws_spot_datafeed_subscription"
-sidebar_current: "docs-aws-resource-spot-datafleet-subscription"
+sidebar_current: "docs-aws-resource-spot-datafeed-subscription"
 description: |-
   Provides a Spot Datafeed Subscription resource.
 ---
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index 8afac7765..5c3ac37ac 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -26,6 +26,9 @@
                         <li<%= sidebar_current("docs-aws-datasource-ami") %>>
                             <a href="/docs/providers/aws/d/ami.html">aws_ami</a>
                         </li>
+                        <li<%= sidebar_current("docs-aws-datasource-ami-ids") %>>
+                            <a href="/docs/providers/aws/d/ami_ids.html">aws_ami_ids</a>
+                        </li>
                         <li<%= sidebar_current("docs-aws-datasource-autoscaling-groups") %>>
                             <a href="/docs/providers/aws/d/autoscaling_groups.html">aws_autoscaling_groups</a>
                         </li>
@@ -35,6 +38,9 @@
                         <li<%= sidebar_current("docs-aws-datasource-availability-zones") %>>
                             <a href="/docs/providers/aws/d/availability_zones.html">aws_availability_zones</a>
                         </li>
+                        <li<%= sidebar_current("docs-aws-datasource-billing-service-account") %>>
+                            <a href="/docs/providers/aws/d/billing_service_account.html">aws_billing_service_account</a>
+                        </li>
                         <li<%= sidebar_current("docs-aws-datasource-caller-identity") %>>
                           <a href="/docs/providers/aws/d/caller_identity.html">aws_caller_identity</a>
                         </li>
@@ -50,6 +56,9 @@
                         <li<%= sidebar_current("docs-aws-datasource-ebs-snapshot") %>>
                           <a href="/docs/providers/aws/d/ebs_snapshot.html">aws_ebs_snapshot</a>
                         </li>
+                        <li<%= sidebar_current("docs-aws-datasource-ebs-snapshot-ids") %>>
+                          <a href="/docs/providers/aws/d/ebs_snapshot_ids.html">aws_ebs_snapshot_ids</a>
+                        </li>
                         <li<%= sidebar_current("docs-aws-datasource-ebs-volume") %>>
                           <a href="/docs/providers/aws/d/ebs_volume.html">aws_ebs_volume</a>
                         </li>
@@ -65,6 +74,9 @@
                         <li<%= sidebar_current("docs-aws-datasource-efs-file-system") %>>
                             <a href="/docs/providers/aws/d/efs_file_system.html">aws_efs_file_system</a>
                         </li>
+                        <li<%= sidebar_current("docs-aws-datasource-eip") %>>
+                            <a href="/docs/providers/aws/d/eip.html">aws_eip</a>
+                        </li>
                         <li<%= sidebar_current("docs-aws-datasource-elb-hosted-zone-id") %>>
                             <a href="/docs/providers/aws/d/elb_hosted_zone_id.html">aws_elb_hosted_zone_id</a>
                         </li>
@@ -92,6 +104,9 @@
                         <li<%= sidebar_current("docs-aws-datasource-ip_ranges") %>>
                             <a href="/docs/providers/aws/d/ip_ranges.html">aws_ip_ranges</a>
                         </li>
+                        <li<%= sidebar_current("docs-aws-datasource-kms-alias") %>>
+                            <a href="/docs/providers/aws/d/kms_alias.html">aws_kms_alias</a>
+                        </li>
                         <li<%= sidebar_current("docs-aws-datasource-kms-secret") %>>
                             <a href="/docs/providers/aws/d/kms_secret.html">aws_kms_secret</a>
                         </li>
@@ -1331,7 +1346,9 @@
                         <li<%= sidebar_current("docs-aws-resource-network-interface") %>>
                             <a href="/docs/providers/aws/r/network_interface.html">aws_network_interface</a>
                         </li>
-
+                        <li<%= sidebar_current("docs-aws-resource-network-interface-attachment") %>>
+                            <a href="/docs/providers/aws/r/network_interface_attachment.html">aws_network_interface_attachment</a>
+                        </li>
                         <li<%= sidebar_current("docs-aws-resource-route|") %>>
                           <a href="/docs/providers/aws/r/route.html">aws_route</a>
                         </li>