diff --git a/website/source/docs/configuration/index.html.md b/website/source/docs/configuration/index.html.md
index ecc47fd154cd..51dca38bbbf5 100644
--- a/website/source/docs/configuration/index.html.md
+++ b/website/source/docs/configuration/index.html.md
@@ -79,7 +79,7 @@ testing.
 
 ## General Parameters
 
-- `acl` `([ACL][acl]: nil)` - Specifies configuration which is specific to ACLs.
+- `acl` `(`[`ACL`]`: nil)` - Specifies configuration which is specific to ACLs.
 
 - `addresses` `(Addresses: see below)` - Specifies the bind address for
   individual network services. Any values configured in this stanza take
@@ -130,10 +130,10 @@ testing.
   Dev mode (`-dev`) defaults to localhost.
   The value supports [go-sockaddr/template format][go-sockaddr/template].
 
-- `client` `([Client][client]: nil)` - Specifies configuration which is specific
+- `client` `(`[`Client`]`: nil)` - Specifies configuration which is specific
   to the Nomad client.
 
-- `consul` `([Consul][consul]: nil)` - Specifies configuration for
+- `consul` `(`[`Consul`]`: nil)` - Specifies configuration for
   connecting to Consul.
 
 - `datacenter` `(string: "dc1")` - Specifies the data center of the local agent.
@@ -208,7 +208,7 @@ testing.
   [data_dir](#data_dir) suffixed with "plugins", like `"/opt/nomad/plugins"`.
   This must be an absolute path.
 
-- `plugin` `([Plugin][plugin]: nil)` - Specifies configuration for a
+- `plugin` `(`[`Plugin`]`: nil)` - Specifies configuration for a
   specific plugin. The plugin stanza may be repeated, once for each plugin being
   configured. The key of the stanza is the plugin's executable name relative to
   the [plugin_dir](#plugin_dir).
@@ -241,18 +241,18 @@ testing.
   with potentially multiple zones, which map to [datacenters](#datacenter) such
   as `us-west` and `us-east`.
 
-- `sentinel` `([Sentinel][sentinel]: nil)` - Specifies configuration for Sentinel
+- `sentinel` `(`[`Sentinel`]`: nil)` - Specifies configuration for Sentinel
   policies.
 
-- `server` `([Server][server]: nil)` - Specifies configuration which is specific
+- `server` `(`[`Server`]`: nil)` - Specifies configuration which is specific
   to the Nomad server.
 
 - `syslog_facility` `(string: "LOCAL0")` - Specifies the syslog facility to
   write to. This has no effect unless `enable_syslog` is true.
 
-- `tls` `([TLS][tls]: nil)` - Specifies configuration for TLS.
+- `tls` `(`[`TLS`]`: nil)` - Specifies configuration for TLS.
 
-- `vault` `([Vault][vault]: nil)` - Specifies configuration for
+- `vault` `(`[`Vault`]`: nil)` - Specifies configuration for
   connecting to Vault.
 
 ## Examples
@@ -277,13 +277,13 @@ http_api_response_headers {
 }
 ```
 
-[hcl]: https://github.com/hashicorp/hcl "HashiCorp Configuration Language"
+[`ACL`]: /docs/configuration/acl.html "Nomad Agent ACL Configuration"
+[`Client`]: /docs/configuration/client.html "Nomad Agent client Configuration"
+[`Consul`]: /docs/configuration/consul.html "Nomad Agent consul Configuration"
+[`Plugin`]: /docs/configuration/plugin.html "Nomad Agent Plugin Configuration"
+[`Sentinel`]: /docs/configuration/sentinel.html "Nomad Agent sentinel Configuration"
+[`Server`]: /docs/configuration/server.html "Nomad Agent server Configuration"
+[`TLS`]: /docs/configuration/tls.html "Nomad Agent tls Configuration"
+[`Vault`]: /docs/configuration/vault.html "Nomad Agent vault Configuration"
 [go-sockaddr/template]: https://godoc.org/github.com/hashicorp/go-sockaddr/template
-[consul]: /docs/configuration/consul.html "Nomad Agent consul Configuration"
-[vault]: /docs/configuration/vault.html "Nomad Agent vault Configuration"
-[tls]: /docs/configuration/tls.html "Nomad Agent tls Configuration"
-[client]: /docs/configuration/client.html "Nomad Agent client Configuration"
-[sentinel]: /docs/configuration/sentinel.html "Nomad Agent sentinel Configuration"
-[server]: /docs/configuration/server.html "Nomad Agent server Configuration"
-[acl]: /docs/configuration/acl.html "Nomad Agent ACL Configuration"
-[plugin]: /docs/configuration/plugin.html "Nomad Agent Plugin Configuration"
+[hcl]: https://github.com/hashicorp/hcl "HashiCorp Configuration Language"
diff --git a/website/source/guides/install/windows-service.html.md b/website/source/guides/install/windows-service.html.md
index f59b60a365a1..ca0c3e9d3143 100644
--- a/website/source/guides/install/windows-service.html.md
+++ b/website/source/guides/install/windows-service.html.md
@@ -1,5 +1,5 @@
 ---
-layout: "docs"
+layout: "guides"
 page_title: "Nomad as a Windows Service"
 sidebar_current: "guides-install-windows-service"
 description: |-
@@ -17,7 +17,7 @@ to register the Nomad application with the Windows Service Control Manager using
 
 ## Register Nomad with Windows
 
-Download the Nomad binary for your architecture.
+[Download] the Nomad binary for your architecture.
 
 Use the [`sc.exe`] command to create a Service named "Nomad". The binPath
 argument should include the fully qualified path to the Nomad executable and any
@@ -72,4 +72,5 @@ The service automatically starts up during/after boot, so you don't need to
 launch Nomad from the command-line again.
 
 [`sc.exe`]: https://msdn.microsoft.com/en-us/library/windows/desktop/ms682107(v=vs.85).aspx
+[Download]: /downloads.html
 [logging]: /docs/configuration/index.html#log_file
diff --git a/website/source/layouts/guides.erb b/website/source/layouts/guides.erb
index 6233a61f43a4..70ed6a336b70 100644
--- a/website/source/layouts/guides.erb
+++ b/website/source/layouts/guides.erb
@@ -34,7 +34,7 @@
             </li>
 
             <li<%= sidebar_current("guides-install-windows-service") %>>
-              <a href="/guides/install/windows-service.html">As a Windows Service</a>
+              <a href="/guides/install/windows-service.html">Windows Service</a>
             </li>
           </ul>
       </li>