diff --git a/doc/kate/menus.docbook b/doc/kate/menus.docbook
--- a/doc/kate/menus.docbook
+++ b/doc/kate/menus.docbook
@@ -610,6 +610,7 @@
 <keycombo action="simul">&Ctrl;<keycap>6</keycap></keycombo>
 </shortcut>
 <guimenu>Edit</guimenu>
+<guisubmenu>Go To</guisubmenu>
 <guimenuitem>Move to Matching Bracket</guimenuitem>
 </menuchoice></term>
 <listitem>
@@ -623,6 +624,7 @@
 <keycombo action="simul">&Ctrl;&Shift;<keycap>6</keycap></keycombo>
 </shortcut>
 <guimenu>Edit</guimenu>
+<guisubmenu>Go To</guisubmenu>
 <guimenuitem>Select to Matching Bracket</guimenuitem>
 </menuchoice></term>
 <listitem>
@@ -633,6 +635,7 @@
 <varlistentry id="edit-go-to-previous-modified-line">
 <term><menuchoice>
 <guimenu>Edit</guimenu>
+<guisubmenu>Go To</guisubmenu>
 <guimenuitem>Move to Previous Modified Line</guimenuitem>
 </menuchoice></term>
 <listitem>
@@ -644,6 +647,7 @@
 <varlistentry id="edit-go-to-next-modified-line">
 <term><menuchoice>
 <guimenu>Edit</guimenu>
+<guisubmenu>Go To</guisubmenu>
 <guimenuitem>Move to Next Modified Line</guimenuitem>
 </menuchoice></term>
 <listitem>
@@ -658,6 +662,7 @@
 <keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo>
 </shortcut>
 <guimenu>Edit</guimenu>
+<guisubmenu>Go To</guisubmenu>
 <guimenuitem>Go to Line...</guimenuitem>
 </menuchoice></term>
 <listitem>
@@ -677,7 +682,6 @@
 </sect1>
 
 <sect1 id="view-menu">
-
 <title>The View Menu</title>
 
 <variablelist>
@@ -1152,29 +1156,26 @@
 Click on the right pointing triangle to expand all toplevel regions.</para></listitem>
 </varlistentry>
 
-<!--FIXME not implemented in kf5
-varlistentry id="view-unfold-toplevel-nodes">
+<varlistentry id="view-unfold-toplevel-nodes">
 <term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;&Shift;<keycap>+</keycap></keycombo>
 </shortcut>
 <guimenuitem>Unfold Toplevel Nodes</guimenuitem>
 </menuchoice></term>
 <listitem><para>Expand all toplevel regions in the document.</para></listitem>
-</varlistentry
-https://git.reviewboard.kde.org/r/127601/
-Dominik Haumann
-I hope this will come back, but noone got around to implement this again... :/
--->
+</varlistentry>
 </variablelist>
 
 </listitem>
 </varlistentry>
 
-<!--FIXME
-Show Non-Printable Spaces Show/hide bounding box around non-printable spaces
-Show Word Count -> Displays the number of words and characters in the document and in the current selection.
--->
+<varlistentry id="view-show-non-printable-spaces">
+<term><menuchoice>
+<guimenuitem>Show Non-Printable Spaces</guimenuitem>
+</menuchoice></term>
+<listitem><para>Show/hide bounding box around non-printable spaces.</para></listitem>
+</varlistentry>
 
 </variablelist>
 
@@ -1429,7 +1430,7 @@
 <ulink url="help:/katepart/dev-scripting.html#dev-scripting-command-line">writing
 your own scripts</ulink>. This way, &kate; can be extended with user-defined tools.
 </para>
-<para><ulink url="help:/katepart/tools.html#scripts">There is a complete list of
+<para><ulink url="help:/katepart/dev-scripting.html">There is a complete list of
 scripts in the &katepart; documentation.</ulink></para>
 </listitem>
 </varlistentry>
diff --git a/doc/katepart/configuring.docbook b/doc/katepart/configuring.docbook
--- a/doc/katepart/configuring.docbook
+++ b/doc/katepart/configuring.docbook
@@ -118,6 +118,11 @@
 <listitem><para>If enabled, the first line is folded, if possible. This is useful, 
 if the file starts with a comment, such as a copyright</para></listitem>
 </varlistentry>
+<varlistentry>
+<term><guilabel>Show Word Count
+</guilabel></term>
+<listitem><para>Displays the number of words and characters in the document and in the current selection.</para></listitem>
+</varlistentry>
 </variablelist>
 </sect3>
 
@@ -1114,7 +1119,7 @@
 he wants, by selecting <guilabel>Disable</guilabel>,
 but this can lead to more data loss.</para>
 <para>When enabled, the swap files are saved in the same folder as the file. 
-When <guilabel>Alternative Folder</guilabel> is chosen, swap files are created in the specified folder. 
+When <guilabel>Alternative Directory</guilabel> is chosen, swap files are created in the specified folder.
 This is useful for network file systems to avoid unnecessary network traffic.</para>
 </listitem>
 </varlistentry>
diff --git a/doc/katepart/menus.docbook b/doc/katepart/menus.docbook
--- a/doc/katepart/menus.docbook
+++ b/doc/katepart/menus.docbook
@@ -820,13 +820,6 @@
 <listitem><para>Show/hide bounding box around non-printable spaces.</para></listitem>
 </varlistentry>
 
-<varlistentry id="view-show-word-count">
-<term><menuchoice>
-<guimenuitem>Show Word Count</guimenuitem>
-</menuchoice></term>
-<listitem><para>Displays the number of words and characters in the document and in the current selection.</para></listitem>
-</varlistentry>
-
 </variablelist>
 
 </sect1>