diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
index d02d00e06b..08b62e248c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
@@ -1,4 +1,3 @@
-</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
 <style type="text/css" media="screen">
@@ -60,6 +59,4 @@ td input { font-size: 1.5em; }
 
 </style>
 </head>
-
 <body>
-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl
index a5bab318f9..4801694e1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl
@@ -1,10 +1,13 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --></title>
-    <!-- TMPL_IF NAME="nopermission" -->Koha &rsaquo; Error: Access Denied<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="timed_out" -->Koha &rsaquo; Error: Session Timed Out --<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="different_ip" -->Koha &rsaquo; Error: IP Address Change -- <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="invalid_username_or_password" -->Koha &rsaquo; Error Invalid Username or Password -- <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="loginprompt" -->Koha &rsaquo; Welcome to the Koha Web Installer<!-- /TMPL_IF -->
-    <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title><!-- TMPL_IF NAME="nopermission" -->Koha &rsaquo; Error: Access Denied<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="timed_out" -->Koha &rsaquo; Error: Session Timed Out --<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="different_ip" -->Koha &rsaquo; Error: IP Address Change -- <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="invalid_username_or_password" -->Koha &rsaquo; Error Invalid Username or Password -- <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="loginprompt" -->Koha &rsaquo; Welcome to the Koha Web Installer<!-- /TMPL_IF --></title>
+
+<!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<div>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>
 <!-- TMPL_IF NAME="nopermission" -->
 <!-- This is what is displayed if user doesn't have permission --><h3>Login Error</h3>
 <p>Sorry, Koha doesn't think you have permission for this page.</p>
@@ -34,9 +37,9 @@
 <h3>Welcome to the Koha Web Installer</h3>
 <p>Before we begin, please verify you have the correct credentials to continue. Please log in
 with the username and password given to you by your systems administrator and located in your
-<code>koha.xml</code>.</p>
+<code>koha.xml</code> configuration file.</p>
 <table>
-	<caption>Please enter your username and password</caption>
+	<caption>Please enter your username and password:</caption>
     <tr><th scope="row"><label for="userid">Username:</label></th><td><input name="userid" id="userid" /></td></tr>
     <tr><th scope="row"><label for="password">Password:</label></th><td><input type="password" name="password" id="password" /></td></tr>
     </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl b/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl
index 3959ed05b4..75887350f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl
@@ -1,13 +1,15 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Web Installer &rsaquo; Step 1
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Web Installer &rsaquo; Step 1</title>
 <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<div>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>
 <h1>Koha &rsaquo; Web Installer &rsaquo; Step 1</h1>
 <!--TMPL_UNLESS Name="language"-->
 <p>You are about to install Koha.</p>
-<form name="language" method="post">
 
 <p>Please pick up your language from the following list. If your langauge is not
 listed, please inform your systems administrator.</p>
-
+<form name="language" method="post">
 <select name="language">
   <!--TMPL_LOOP Name="languages"-->
   <option value="<!--TMPL_VAR Name="value" -->""><!--TMPL_VAR Name="description"-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl b/koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl
index 51a4c897db..6e53cda49b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl
@@ -1,5 +1,7 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Web Installer &rsaquo; Step 2
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Web Installer &rsaquo; Step 2</title>
 <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<div>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>
 <h1>Koha &rsaquo; Web Installer &rsaquo; Step 2</h1>
 <h2 align="center">Database settings:</h2>
 <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl b/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl
index 6565853f39..7b1c4a7c40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl
@@ -1,5 +1,7 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Web Installer &rsaquo; Step 3
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Web Installer &rsaquo; Step 3</title>
 <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<div>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>
 <h1>Koha &rsaquo; Web Installer &rsaquo; Step 3</h1>
 <!--TMPL_IF NAME="selectframeworks"-->
 <script language="JavaScript">
@@ -75,11 +77,12 @@ function Hide(link) {
 <!--/TMPL_IF-->
 
 <!--TMPL_IF Name="selectframeworks"-->
-  <h2 align="center">Selecting Frameworks</h2>
+  <h2 align="center">Selecting Default Settings</h2>
   <form name="frameworkselection" method="post" action="install.pl">
   <input type="hidden" name="step" value="3" />
   <input type="hidden" name="op" value="addframeworks" />
-  <p>Please select a framework language you want to import:</p>
+  <p>Each language has a set of default settings that cover a wide range of configuration options. Please select a language from the dropdown or use the default lanaguage already selected.</p>
+
   <p><select name="fwklanguage" onchange="javascript:refresh(this.value)">
   <!--TMPL_LOOP Name="languagelist" -->
   <!--TMPL_IF Name="checked"--><option value="<!--TMPL_VAR Name="dirname"-->" selected ><!--TMPL_VAR Name="languagedescription"--></option>
@@ -88,29 +91,26 @@ function Hide(link) {
   <!--/TMPL_LOOP-->
   </select>
   </p>
-  <p><!--TMPL_LOOP Name="levelloop"-->
-  <a id="link<!--TMPL_VAR Name="code"-->" style="color: grey; cursor: se-resize;"  onclick="Hide('<!--TMPL_VAR Name="code"-->')">+</a>
-  <!--TMPL_VAR Name="label"-->
-  <!--/TMPL_LOOP-->
-  </p>
   <p>
   <!--TMPL_LOOP Name="levelloop"-->
-  <div id="bloc<!--TMPL_VAR Name="code"-->" style="display:none">
+  <div>
   <h3><!--TMPL_VAR Name="label"--></h3>
   <!--TMPL_LOOP Name="frameworks"-->
-    <p><em><!--TMPL_VAR Name="fwkname"--></em>
+    <div style="border:1px;">
+    <p>
     <!--TMPL_IF Name="mandatory"--><input type="checkbox" Name="framework" value="<!--TMPL_VAR Name="fwkfile"-->" checked />
     <!--TMPl_ELSE--><input type="checkbox" Name="framework" value="<!--TMPL_VAR Name="fwkfile"-->" />
-    <!--/TMPL_IF--><br />
+    <!--/TMPL_IF-->
     <!--TMPL_VAR Name="fwkdescription"-->
+    <em>(<!--TMPL_VAR Name="fwkname"-->)</em>
     </p>
+    </div>
   <!--/TMPL_LOOP-->
   </div>
   </p>
   <!--/TMPL_LOOP-->
-  <p>Hint: You can select specific frameworks from each framework set by clicking on the <code>+</code> to expand.</p>
   <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete,
-  please be patient</p>
+  please be patient.</p>
   <p><input type="submit" value="import" />
   </p>
   </form>
@@ -150,20 +150,29 @@ function Hide(link) {
   <ul>
   <li>Database tables created</li>
   </ul>
- 		<a href="install.pl?step=3" class="button">Click here</a> to continue.
+  <form action="install.pl">
+  <input type="hidden" name="step" value="3" />
+  <p> Click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
+  </form>
+
 	<!-- /TMPL_IF -->
 <!--/TMPL_IF-->
 <!--TMPL_IF Name="proposeimport"-->
   <p>Now we're ready to create the database tables and fill them with some default data.</p>
-<a href="install.pl?step=3&amp;op=importdatastructure" class="button">Click here</a> to continue.
+  <form action="install.pl">
+  <input type="hidden" name="step" value="3" />
+  <input type="hidden" name="op" value="importdatastructure"/>
+  <p> Click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
+  </form>
+
 
 <!--/TMPL_IF-->
 <!--TMPL_IF Name="default"-->
 
-You can now <a href="install.pl?step=3&amp;op=updatestructure" class="button">update your database</a>
-structure to the latest version if you are upgrading from a previous version of Koha.
+<p>Now we're ready to do some basic configuration. Please <a href="install.pl?step=3&amp;op=selectframeworks" class="button">install basic configuration settings</a> to continue the installation.</p>
+<p>
+Alternatively, if you are upgrading from a previous version of Koha, you can <a href="install.pl?step=3&amp;op=updatestructure" class="button">update your database</a>. Otherwise, you can skip this step.
 </p>
-<p>Otherwise, <a href="install.pl?step=3&amp;op=selectframeworks" class="button">select frameworks to import</a> to continue the installation.</p>
 
 <!--/TMPL_IF-->
 <!--TMPL_IF Name="updatestructure"-->
@@ -179,5 +188,6 @@ structure to the latest version if you are upgrading from a previous version of
 <a href="install.pl?step=3&amp;op=selectframeworks" class="button">Continue to Framework Selection</a>
   </div>
 <!--/TMPL_IF-->
+</div>
 </body>
 </html>
diff --git a/misc/sql-datas/en/optional/auth_val.txt b/misc/sql-datas/en/optional/auth_val.txt
index 97cdf0e3d7..c234c3fcfe 100644
--- a/misc/sql-datas/en/optional/auth_val.txt
+++ b/misc/sql-datas/en/optional/auth_val.txt
@@ -1 +1 @@
-Default authorised values for Library Departments, Item Lost status, etc
+Some basic default authorised values for Library Departments, Item Lost status, etc. You can change these at any time after installation.
diff --git a/misc/sql-datas/en/optional/itemtypes_default.txt b/misc/sql-datas/en/optional/itemtypes_default.txt
index 715b803404..f2b0bcc5e8 100644
--- a/misc/sql-datas/en/optional/itemtypes_default.txt
+++ b/misc/sql-datas/en/optional/itemtypes_default.txt
@@ -1 +1 @@
-Set of default item types for Koha cataloging.
+A set of default item types (material types and collection codes).
diff --git a/misc/sql-datas/en/optional/library.txt b/misc/sql-datas/en/optional/library.txt
index 9a47cabb4e..f47bcd566c 100644
--- a/misc/sql-datas/en/optional/library.txt
+++ b/misc/sql-datas/en/optional/library.txt
@@ -1 +1 @@
-A default branch and borrower type, USD currency, and z39.50 servers.
+Some basic settings including a default branch, borrower type, USD currency, and a sampling of Z39.50 servers.
diff --git a/misc/sql-datas/en/optional/marc21_simple_bib_frameworks.txt b/misc/sql-datas/en/optional/marc21_simple_bib_frameworks.txt
index 0e0b969254..102cd5873f 100644
--- a/misc/sql-datas/en/optional/marc21_simple_bib_frameworks.txt
+++ b/misc/sql-datas/en/optional/marc21_simple_bib_frameworks.txt
@@ -1,4 +1,5 @@
-Frameworks for common types:
+Bibliographic Frameworks for some common types. Frameworks are used to define the structure of your MARC records and the behavior of the integrated MARC editor. You can change these at any time after installation. The frameworks in this optional default setting include:
+
 ('BKS', 'Books, Booklets, Workbooks');
 ('CF', 'CD-ROMs, DVD-ROMs, General Online Resources');
 ('SR', 'Audio Cassettes, CDs');
