diff --git a/userguide/en/applications/installer.html b/userguide/en/applications/installer.html
index a0395f2f..e79a2355 100644
--- a/userguide/en/applications/installer.html
+++ b/userguide/en/applications/installer.html
@@ -61,7 +61,7 @@ chainloader	+1</pre></li>
 <p>In the first drop-down menu you choose the source for the installation. It can be a currently installed Haiku or can come from an install CD or USB drive, etc.<br />
 The second drop-down menu specifies the target for the installation. This target partition/volume will be completely overwritten and has to be set aside beforehand by a partitioning tool like GParted.</p>
 <p>Clicking the little expander widget will <i>Show Optional Packages</i>, if available, that you can choose to install in addition to the basic Haiku.</p>
-<p>You should do a last check if you really picked the right target before starting the installation process. Click on <span class="button">Setup partitions...</span> to open <a href="applications/drivesetup.html">DriveSetup</a> and have a look at the naming and layout of the available volumes and partitions.</p>
+<p>You should do a last check if you really picked the right target before starting the installation process. Click on <span class="button">Setup partitions...</span> to open <a href="drivesetup.html">DriveSetup</a> and have a look at the naming and layout of the available volumes and partitions.</p>
 <p><span class="button">Begin</span> starts the installation procedure, which basically copies everything but the <span class="path">home/</span> and <span class="path">common/</span> folder onto the target volume and makes it bootable.</p>
 <p>It can happen that some other operating system or partitioning tool (accidentally) overwrites the boot sector of your Haiku volume. The button <span class="button">Write Boot Sector</span> makes it bootable again.</p>
 
diff --git a/userguide/en/gui.html b/userguide/en/gui.html
index 0f24a0a7..c0ddcfd5 100644
--- a/userguide/en/gui.html
+++ b/userguide/en/gui.html
@@ -66,7 +66,7 @@ You can enter parent folders with the drop-down menu above the file listing.</p>
 <h2>
 <a href="#logo"><img src="../images/up.png" align="right" alt="index" border="0" class="noprint" /></a>
 <a id="open-save-shortcuts" name="open-save-shortcuts">Keyboard shortcuts</a></h2>
-<p>You can use many of the shortcuts also used in Tracker. Besides the commands that are also available through the <span class="menu">File</span> menu, there are a few not that obvious:</p>
+<p>Many shortcuts in open and save panels are the same used in Tracker. Besides the commands that are also available through the <span class="menu">File</span> menu, there are a few not that obvious:</p>
 <table summary="shortcuts" border="0" cellspacing="0" cellpadding="2">
 <tr><td><span class="key">ALT</span>&#160;<span class="key">N</span></td><td></td><td> Creates a new folder.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">E</span></td><td></td><td> Lets you rename the selected entry.</td></tr>
@@ -79,7 +79,7 @@ You can enter parent folders with the drop-down menu above the file listing.</p>
 <h2>
 <a href="#logo"><img src="../images/up.png" align="right" alt="index" border="0" class="noprint" /></a>
 <a id="favorites-recent" name="favorites-recent">Favorites and recent folders</a></h2>
-<p>The menu <span class="menu">Favorites</span> provides recently visited folders and favorite locations that you can set up yourself. As indicated by the little arrow, you can also use these locations to navigate further down the hierarchy via submenus.</p>
+<p>The <span class="menu">Favorites</span> menu in open and save panels provides recently visited folders and favorite locations that you can set up yourself. As indicated by the little arrow, you can also use these locations to navigate further down the hierarchy via submenus.</p>
 <img src="images/gui-images/favorites.png" alt="favorites.png" />
 <p>To add a Favorite, you simply navigate to your destination and choose <span class="menu">Favorites | Add Current Folder</span>. From now on it will appear in every open/save panel. To remove a Favorite, choose <span class="menu">Favorites | Configure Favorites...</span> and delete its entry.<br />
 All Favorites are kept in <span class="path">/boot/home/config/settings/Tracker/Go/</span>. So you might as well add and remove links to files and folders there directly.</p>