diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 545218a..0db7576 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -10,34 +10,40 @@
 ** xref:anaconda/anaconda.adoc[Anaconda: the Fedora installer]
 *** xref:anaconda/anaconda_logging.adoc[Anaconda Logging]
 
-* Usage and customisation
+* Adding and managing software
+** xref:package-management.adoc[Package management system]
 ** xref:dnf.adoc[Using the DNF software package manager]
 ** xref:repositories.adoc[Fedora Repositories]
 ** xref:finding-and-installing-linux-applications.adoc[Finding and installing Linux applications]
 ** xref:adding-or-removing-software-repositories-in-fedora.adoc[Adding or removing software repositories in Fedora]
 ** xref:setup_rpmfusion.adoc[Enabling the RPM Fusion repositories]
+** xref:fonts.adoc[Adding new fonts]
+** xref:packagekit-not-found.adoc[PackageKit Items Not Found]
+** xref:securing-the-system-by-keeping-it-up-to-date.adoc[Securing the system by keeping it up-to-date]
+** xref:autoupdates.adoc[AutoUpdates]
+** xref:installing-java.adoc[Installing Java]
+** xref:assembly_installing-plugins-for-playing-movies-and-music.adoc[Installing plugins for playing movies and music]
+** xref:openh264.adoc[OpenH264]
 ** xref:installing-chromium-or-google-chrome-browsers.adoc[Installing Chromium or Google Chrome browsers]
+** xref:installing-spotify.adoc[Installing Spotify on Fedora]
+** xref:installing-skype.adoc[Installing Skype on Fedora]
+
+* Usage and customisation
 ** xref:switching-desktop-environments.adoc[Switching desktop environments]
 ** xref:configuring-x-window-system-using-the-xorg-conf-file.adoc[Configuring X Window System using the xorg.conf file]
 ** xref:configuring-xorg-as-default-gnome-session.adoc[Configuring X.org as the default GNOME session]
 ** xref:gnome-shell-extensions.adoc[Using GNOME Shell extensions]
 ** xref:wine.adoc[Running Windows applications with Wine]
 ** xref:using-adobe-flash.adoc[Using Adobe Flash]
-** xref:fonts.adoc[Adding new fonts]
 ** xref:create-gpg-keys.adoc[Creating GPG Keys]
 ** xref:bootloading-with-grub2.adoc[Bootloading with GRUB2]
-** xref:securing-the-system-by-keeping-it-up-to-date.adoc[Securing the system by keeping it up-to-date]
-** xref:installing-java.adoc[Installing Java]
 ** xref:proc_setting-key-shortcut.adoc[Setting a key shortcut to run an application in GNOME]
 ** xref:disabling-automatic-screenlock.adoc[Disabling the GNOME automatic screen locking]
 ** xref:viewing-logs.adoc[Viewing logs in Fedora]
 ** xref:encrypting-drives-using-LUKS.adoc[Encrypting drives using LUKS]
-** xref:assembly_installing-plugins-for-playing-movies-and-music.adoc[Installing plugins for playing movies and music]
 ** xref:installing-and-running-vlc.adoc[Installing and running the VLC player]
 ** xref:configuring-ip-networking-with-nmcli.adoc[Configuring networking with NetworkManager CLI (nmcli)]
 ** xref:using-shared-system-certificates.adoc[Using shared system certificates]
-** xref:installing-spotify.adoc[Installing Spotify on Fedora]
-** xref:installing-skype.adoc[Installing Skype on Fedora]
 ** xref:adding_user_to_sudoers_file.adoc[Adding a user to sudoers]
 ** xref:performing-administration-tasks-using-sudo.adoc[Performing administration tasks using sudo]
 ** xref:understanding-and-administering-systemd.adoc[Understanding and administering systemd]
@@ -59,6 +65,7 @@
 
 * xref:upgrading.adoc[Upgrading to a new release]
 ** xref:dnf-system-upgrade.adoc[Upgrading Fedora using the DNF system upgrade]
+** xref:upgrading-fedora-online.adoc[Upgrading Fedora using package manager]
 
 * xref:kernel/overview.adoc[Kernel]
 ** xref:kernel/troubleshooting.adoc[Troubleshooting]
@@ -73,19 +80,17 @@
 ** xref:creating-windows-virtual-machines-using-virtio-drivers.adoc[Creating Windows virtual machines using virtIO drivers]
 ** xref:how-to-use-vmware.adoc[How to use Vmware Product's]
 
-* xref:autoupdates.adoc[AutoUpdates]
+
 * xref:debug-dracut-problems.adoc[How to debug Dracut problems]
 //FIXME * xref:debug-systemd-problems.adoc[How to debug systemd problems]
 //FIXME * xref:debug-wayland-problems.adoc[How to debug Wayland problems] - note: maintained on wiki, does not fit quick-docs IMHO
 //FIXME * xref:fedora-life-cycle.adoc[Fedora Release Life Cycle] - note: maintained on wiki, does not fit quick-docs IMHO
 //FIXME * xref:enable-touchpad-click.adoc[How to enable touchpad click]
 //FIXME * xref:mirroring.adoc[Mirroring]
-* xref:openh264.adoc[OpenH264]
-* xref:package-management.adoc[Package management system]
-* xref:packagekit-not-found.adoc[PackageKit Items Not Found]
+
 * xref:postgresql.adoc[PostgreSQL]
 //FIXME * xref:uefi-with-qemu.adoc[Using UEFI with QEMU]
-* xref:upgrading-fedora-online.adoc[Upgrading Fedora using package manager]
+
 
 * xref:creating-rpm-packages.adoc[Creating RPM packages]
 ** xref:create-hello-world-rpm.adoc[Creating a GNU Hello World RPM Package]