diff --git a/website/source/docs/providers/azurerm/r/availability_set.html.markdown b/website/source/docs/providers/azurerm/r/availability_set.html.markdown
index 651c39b2e..84064aacf 100644
--- a/website/source/docs/providers/azurerm/r/availability_set.html.markdown
+++ b/website/source/docs/providers/azurerm/r/availability_set.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "azurerm"
 page_title: "Azure Resource Manager: azurerm_availability_set"
-sidebar_current: "docs-azurerm-resource-availability-set"
+sidebar_current: "docs-azurerm-resource-virtualmachine-availability-set"
 description: |-
   Create an availability set for virtual machines.
 ---
diff --git a/website/source/docs/providers/azurerm/r/public_ip.html.markdown b/website/source/docs/providers/azurerm/r/public_ip.html.markdown
index 0616381a8..63ccbc5bc 100644
--- a/website/source/docs/providers/azurerm/r/public_ip.html.markdown
+++ b/website/source/docs/providers/azurerm/r/public_ip.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "azurerm"
 page_title: "Azure Resource Manager: azurerm_public_ip"
-sidebar_current: "docs-azurerm-resource-public-ip"
+sidebar_current: "docs-azurerm-resource-network-public-ip"
 description: |-
   Create a Public IP Address.
 ---
diff --git a/website/source/docs/providers/azurerm/r/subnet.html.markdown b/website/source/docs/providers/azurerm/r/subnet.html.markdown
index 78699ce38..b75f1ba95 100644
--- a/website/source/docs/providers/azurerm/r/subnet.html.markdown
+++ b/website/source/docs/providers/azurerm/r/subnet.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "azurerm"
 page_title: "Azure Resource Manager: azure_subnet"
-sidebar_current: "docs-azurerm-resource-subnet"
+sidebar_current: "docs-azurerm-resource-network-subnet"
 description: |-
   Creates a new subnet. Subnets represent network segments within the IP space defined by the virtual network.
 ---
diff --git a/website/source/docs/providers/azurerm/r/virtual_network.html.markdown b/website/source/docs/providers/azurerm/r/virtual_network.html.markdown
index ff8cdf4c8..de3cee292 100644
--- a/website/source/docs/providers/azurerm/r/virtual_network.html.markdown
+++ b/website/source/docs/providers/azurerm/r/virtual_network.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "azurerm"
 page_title: "Azure Resource Manager: azure_virtual_network"
-sidebar_current: "docs-azurerm-resource-virtual-network"
+sidebar_current: "docs-azurerm-resource-network-virtual-network"
 description: |-
   Creates a new virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet.
 ---
diff --git a/website/source/layouts/azurerm.erb b/website/source/layouts/azurerm.erb
index a870fae61..eb27154e0 100644
--- a/website/source/layouts/azurerm.erb
+++ b/website/source/layouts/azurerm.erb
@@ -10,43 +10,52 @@
                     <a href="/docs/providers/azurerm/index.html">Azure Resource Manager Provider</a>
                 </li>
 
-                <li<%= sidebar_current(/^docs-azurerm-resource/) %>>
-                    <a href="#">Resources</a>
-                    <ul class="nav nav-visible">
-                        <li<%= sidebar_current("docs-azurerm-resource-resource-group") %>>
-                            <a href="/docs/providers/azurerm/r/resource_group.html">azurerm_resource_group</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-azurerm-resource-virtual-network") %>>
-                            <a href="/docs/providers/azurerm/r/virtual_network.html">azurerm_virtual_network</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-azurerm-resource-local-network-gateway") %>>
-                            <a href="/docs/providers/azurerm/r/local_network_gateway.html">azurerm_local_network_gateway</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-azurerm-resource-availability-set") %>>
-                          <a href="/docs/providers/azurerm/r/availability_set.html">azurerm_availability_set</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-azurerm-resource-network-security-group") %>>
-                          <a href="/docs/providers/azurerm/r/network_security_group.html">azurerm_network_security_group</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-azurerm-resource-network-security-rule") %>>
-                          <a href="/docs/providers/azurerm/r/network_security_rule.html">azurerm_network_security_rule</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-azurerm-resource-public-ip") %>>
-                          <a href="/docs/providers/azurerm/r/public_ip.html">azurerm_public_ip</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-azurerm-resource-subnet") %>>
-                          <a href="/docs/providers/azurerm/r/subnet.html">azurerm_subnet</a>
-                        </li>
-
-                    </ul>
+                <li<%= sidebar_current("docs-azurerm-resource-resource-group") %>>
+                  <a href="/docs/providers/azurerm/r/resource_group.html">azurerm_resource_group</a>
                 </li>
+
+                <li<%= sidebar_current(/^docs-azurerm-resource-network/) %>>
+                  <a href="#">Network Resources</a>
+                  <ul class="nav nav-visible">
+
+                    <li<%= sidebar_current("docs-azurerm-resource-network-virtual-network") %>>
+                      <a href="/docs/providers/azurerm/r/virtual_network.html">azurerm_virtual_network</a>
+                    </li>
+
+                    <li<%= sidebar_current("docs-azurerm-resource-network-security-group") %>>
+                      <a href="/docs/providers/azurerm/r/network_security_group.html">azurerm_network_security_group</a>
+                    </li>
+
+                    <li<%= sidebar_current("docs-azurerm-resource-network-security-rule") %>>
+                      <a href="/docs/providers/azurerm/r/network_security_rule.html">azurerm_network_security_rule</a>
+                    </li>
+
+                    <li<%= sidebar_current("docs-azurerm-resource-network-public-ip") %>>
+                      <a href="/docs/providers/azurerm/r/public_ip.html">azurerm_public_ip</a>
+                    </li>
+
+                    <li<%= sidebar_current("docs-azurerm-resource-network-subnet") %>>
+                      <a href="/docs/providers/azurerm/r/subnet.html">azurerm_subnet</a>
+                    </li>
+
+                    <li<%= sidebar_current("docs-azurerm-resource-local-network-gateway") %>>
+                      <a href="/docs/providers/azurerm/r/local_network_gateway.html">azurerm_local_network_gateway</a>
+                    </li>
+
+                  </ul>
+                </li>
+
+                <li<%= sidebar_current(/^docs-azurerm-resource-virtualmachine/) %>>
+                  <a href="#">Virtual Machine Resources</a>
+                  <ul class="nav nav-visible">
+
+                    <li<%= sidebar_current("docs-azurerm-resource-virtualmachine-availability-set") %>>
+                      <a href="/docs/providers/azurerm/r/availability_set.html">azurerm_availability_set</a>
+                    </li>
+
+                  </ul>
+                </li>
+              
             </ul>
         </div>
     <% end %>