diff --git a/plugins/active_link.rb b/plugins/active_link.rb
index bd5853f7022..6b6063cffac 100644
--- a/plugins/active_link.rb
+++ b/plugins/active_link.rb
@@ -10,7 +10,7 @@ module Jekyll
     def render(context)
       href = Liquid::Template.parse(@href).render context
       title = Liquid::Template.parse(@title).render context
-      cls = @href == context.registers[:page]["url"] ? "class='active'" : ''
+      cls = href == context.registers[:page]["url"] ? "class='active'" : ''
       "<a #{cls} href='#{href}'>#{title}</a>"
     end
   end
diff --git a/source/_includes/asides/cloud_navigation.html b/source/_includes/asides/cloud_navigation.html
index 0cd1103ac97..48ca4058146 100644
--- a/source/_includes/asides/cloud_navigation.html
+++ b/source/_includes/asides/cloud_navigation.html
@@ -1,6 +1,6 @@
 <section class="aside-module grid__item one-whole lap-one-half">
   <h1 class="title delta">About Home Assistant</h1>
-  <ul class="divided">
+  <ul class="divided sidebar-menu">
     <li>
       The Home Assistant Cloud is a cloud-based service provided to supporters of the Home Assistant project.
     </li>
@@ -13,5 +13,8 @@
     <li>
       {% active_link /cloud/google_assistant/ Google Assistant %}
     </li>
+    <li>
+      {% active_link /cloud/troubleshooting/ Troubleshooting %}
+    </li>
   </ul>
 </div>
diff --git a/source/_includes/asides/lovelace_navigation.html b/source/_includes/asides/lovelace_navigation.html
index 325b0731a11..d78a68ce5b4 100644
--- a/source/_includes/asides/lovelace_navigation.html
+++ b/source/_includes/asides/lovelace_navigation.html
@@ -4,22 +4,20 @@
 
   <div class='section'>
     <h1 class="title delta">Lovelace UI</h1>
-    <ul class='divided'>
-      <li><a href='/lovelace/'>Introduction</a></li>
-      <li><a href='/lovelace/changelog/'>Changelog</a></li>
-      <li><a href='/lovelace/views/'>Views</a></li>
+    <ul class='divided sidebar-menu'>
+      <li>{% active_link /lovelace/ Introduction %}</li>
+      <li>{% active_link /lovelace/changelog/ Changelog %}</li>
+      <li>{% active_link /lovelace/views/ Views %}</li>
     </ul>
   </div>
 
   <div class='section'>
     <h1 class="title delta">Cards</h1>
-    <ul class='divided'>
+    <ul class='divided sidebar-menu'>
       {% for card in cards %}
-        <li>
-          <a href='{{card.url}}'>{{ card.sidebar_label }}</a>
-        </li>
+        <li>{% active_link {{card.url}} {{card.sidebar_label}} %}</li>
       {% endfor %}
     </ul>
   </div>
-  
+
 </section>
diff --git a/source/cloud/troubleshooting.markdown b/source/cloud/troubleshooting.markdown
new file mode 100644
index 00000000000..c9868e882f1
--- /dev/null
+++ b/source/cloud/troubleshooting.markdown
@@ -0,0 +1,38 @@
+---
+layout: page
+title: "Troubleshooting Home Assistant Cloud"
+description: "Pointers to help troubleshooting issues with Home Assistant Cloud."
+date: 2018-07-17 20:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+Alright, so you got all excited, tried to setup cloud and it failed? Not to worry, here are some common issues and how to resolve them.
+
+## {% linkable_title Error fetching the cognito keyset %}
+
+This issue can occur by Docker being misconfigured. This issue is especially common for people using the GENERIC installation of Hass.io on top of Ubuntu Bionic or another Linux installation. It is related to IPv6 being incorrectly marked as available.
+
+The solution is to make sure that Docker uses a public available DNS server, like the Google ones. As root, run:
+
+```
+mkdir -p /etc/docker
+echo '{"dns": ["8.8.8.8", "8.8.4.4"]}' > /etc/docker/daemon.json
+```
+
+## {% linkable_title Alexa: We were unable to link Home Assistant at this time. Please try again later %}
+
+Some users are experiencing an issue when they are setting up the Home Assistant skill inside the Alexa app. We are still researching what is going on. Some users have reported that the issue went away if they configured Alexa to not expose all entities. You can try this by changing your cloud configuration like this:
+
+```yaml
+# Example configuration.yaml entry configuring Alexa
+cloud:
+  alexa:
+    filter:
+      include_entities:
+        - light.kitchen
+```
+
+If this resolves the issue, please report it in the #cloud channel on Discord as it can help us find the entities that are causing this issue.
diff --git a/source/lovelace/index.markdown b/source/lovelace/index.markdown
index 0a397b9400a..649eb76b341 100644
--- a/source/lovelace/index.markdown
+++ b/source/lovelace/index.markdown
@@ -116,6 +116,6 @@ This is probably because your version of Firefox doesn't have custom components
 
 ### Custom components don't load on my IOS device?
 
-This is because for IOS devices by default javascript served is `es5`. You can allow custom components to load by forcing `javascript_version: latest` in your `configuration.yaml` under `frontend:`. 
+This is because for IOS devices by default javascript served is `es5`. You can allow custom components to load by forcing `javascript_version: latest` in your `configuration.yaml` under `frontend:`.
 
 > Note: Enabling `latest` on IOS could cause automation and script editor to crash.