diff --git a/manual/gui.rst b/manual/gui.rst
index 967e6b6cc0..b082774ee3 100644
--- a/manual/gui.rst
+++ b/manual/gui.rst
@@ -1,7 +1,7 @@
 .. _gui:
 
 The Graphical User Interface
-=============================
+===============================================
 
 The Graphical User Interface *(GUI)* provides access to all
 library management and ebook format conversion features. The basic workflow
diff --git a/manual/simple_index.rst b/manual/simple_index.rst
index b1ced67f2d..37bd6574de 100644
--- a/manual/simple_index.rst
+++ b/manual/simple_index.rst
@@ -13,7 +13,7 @@ Once you've admired the list of books you just added to your heart's content, yo
 
 If you want to read the book on your reader, connect it to the computer, wait till calibre detects it (10-20 seconds) and then click the "Send to device" button. Once the icon stops spinning again, disconnect your reader and read away! If you didn't convert the book in the previous step, calibre will auto convert it to the format your reader device understands. 
 
-To get started with more advanced usage, you should read about the :ref:`Graphical User Interface <gui>`. For even more power and versatility, learn the :ref:`Command Line Interface <cli>`. You will find the list of :ref:`Frequently Asked Questions <faq>` useful as well. 
+To get started with more advanced usage, you should read about :doc:`gui`. For even more power and versatility, learn the :doc:`generated/|lang|/cli-index`. You will find the list of :doc:`faq` useful as well. 
 
 .. only:: online