diff --git a/client/src/components/Chapter.vue b/client/src/components/Chapter.vue
index e69859f1..5e845597 100644
--- a/client/src/components/Chapter.vue
+++ b/client/src/components/Chapter.vue
@@ -3,7 +3,7 @@
     :data-scrollto="chapter.id"
     class="chapter">
     <div
-      :class="{'hideable-element--hidden': titleGreyedOut}"
+      :class="{'hideable-element--greyed-out': titleGreyedOut}"
       class="hideable-element"
       v-if="!titleHidden">
       <h3
@@ -26,7 +26,7 @@
       @bookmark="bookmark(!chapter.bookmark)"
     />
     <div
-      :class="{'hideable-element--hidden': descriptionGreyedOut}"
+      :class="{'hideable-element--greyed-out': descriptionGreyedOut}"
       class="chapter__intro intro hideable-element"
       v-if="!descriptionHidden"
     >
@@ -97,10 +97,9 @@ export default {
       }));
     },
     note() {
-      if (!(this.chapter && this.chapter.bookmark)) {
-        return;
+      if (this.chapter && this.chapter.bookmark) {
+        return this.chapter.bookmark.note;
       }
-      return this.chapter.bookmark.note;
     },
     titleGreyedOut() {
       return this.textHidden(CHAPTER_TITLE_TYPE) && this.editModule;
diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index 67e32e7b..c0490b65 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    :class="{'hideable-element--hidden': hidden}"
+    :class="{'hideable-element--greyed-out': hidden}"
     class="content-block__container hideable-element">
     <div
       :class="specialClass"
diff --git a/client/src/components/objective-groups/Objective.vue b/client/src/components/objective-groups/Objective.vue
index a989f680..176d2007 100644
--- a/client/src/components/objective-groups/Objective.vue
+++ b/client/src/components/objective-groups/Objective.vue
@@ -1,6 +1,6 @@
 <template>
   <li
-    :class="{'hideable-element--hidden': hidden}"
+    :class="{'hideable-element--greyed-out': hidden}"
     class="objective hideable-element"
     v-if="editModule || !hidden">
     <visibility-action
diff --git a/client/src/styles/_visibility.scss b/client/src/styles/_visibility.scss
index 6eaee061..42d3f7cd 100644
--- a/client/src/styles/_visibility.scss
+++ b/client/src/styles/_visibility.scss
@@ -1,7 +1,7 @@
 .hideable-element {
   position: relative;
 
-  &--hidden {
+  &--greyed-out {
     &::before {
       content: '';
       position: absolute;