diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/print.css b/koha-tmpl/intranet-tmpl/prog/en/css/print.css
new file mode 100644
index 0000000000..b613f6e18a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/print.css
@@ -0,0 +1,313 @@
+a:link {
+	color : #000066;
+	text-decoration: none;
+}
+
+a:visited {
+	color : #000066;
+	text-decoration: none;
+}
+
+a:hover {
+	color : #993300;
+	text-decoration: none;
+}
+
+body {
+	background-color : #FFF;
+	color : #333333;
+	font-family : arial, geneva, sans-serif;
+	font-size : 14px;
+	margin : 0px 0px 0px 0px;
+}
+
+caption {
+	color : #000066;
+	font-size : 18px;
+	font-weight : bold;
+	margin-top : 5px;
+	text-align : left;
+}
+
+form {
+	margin : 0px;
+	padding : 0px;
+}
+
+h1
+	{
+	color : #000066;
+	font-size : 22px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h2 {
+	color : #000066;
+	font-size : 20px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h3 {
+	color : #000066;
+	font-size : 18px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h4 {
+	color : #000066;
+	font-size : 16px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h5 {
+	color : #000066;
+	font-size : 15px;
+	font-weight : bold;
+	margin-bottom : 1px;
+	margin-top : 1px;
+}
+
+h6 {
+	color : #000066;
+	font-size : 14px;
+	font-weight : bold;
+	margin-bottom : 1px;
+	margin-top : 1px;
+}
+
+table {
+	background-color : #FFFFFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-collapse : collapse;
+	border-left : 1px solid #CCCCCC;
+	margin : 3px 0px 5px 0px;
+	padding : 0px;
+	width : 99%;
+}
+
+table.list {
+	background-color : #FFFFFF;
+	border : 0;
+	border-collapse : collapse;
+	margin : 3px 0px 5px 0px;
+	padding : 0px;
+	width : 99%;
+}
+
+td {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 12px;
+	padding : 5px 5px 5px 5px;
+}
+
+td:last-child {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 0px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 12px;
+	padding : 5px 5px 5px 5px;
+}
+
+table.list th {
+	background-color : #FFFFFF;
+	border-top : 0;
+	border-left : 0;
+	text-align: left;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 5px;
+	width : 25%;
+}
+
+th {
+	background-color : #E9E9E9;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 14px;
+	font-weight : bold;
+	padding : 5px 5px 5px 5px;
+}
+
+th:last-child {
+	background-color : #E9E9E9;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 0px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 14px;
+	font-weight : bold;
+	padding : 5px 5px 5px 5px;
+}
+
+td.input, div.form td, div.details td {
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 0px;
+	border-right : 0px;
+	color : #000000;
+	line-height : 1.5em;
+	padding : 4px;
+	text-align : left;
+}
+
+td.label, div.form th, div.details th {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 0px;
+	border-top : 0px;
+	color : #000088;
+	font-weight : bold;
+	line-height : 1.5em;
+	padding : 4px;
+	text-align : right;
+	vertical-align : top;
+}
+
+tr.highlight {
+	background-color: #CCCCCC;
+}
+
+.cancel {
+	background-color : #993300;
+	color : #FFFFCC;
+	font-size : 12px;
+	font-weight : bold;
+	padding : 2px;
+}
+
+.error {
+	font-weight: bold;
+}
+
+.ex {
+	font-family : "Courier New", Courier, monospace;
+}
+.inline {
+	display : inline;
+}
+
+.print {
+	display : none;
+}
+
+.submit {
+	background-color : #669999;
+	color : #FFFFCC;
+	font-size : 12px;
+	font-weight : bold;
+	padding : 2px;
+}
+
+#main {
+	background-color : #FFF;
+	border-left : 0px solid #CCCC99;
+	margin-left : 2%;
+	margin-right : 2%;
+	margin-top : 1%;
+	padding : 5px;
+	position : relative;
+}
+
+tr.overdue {
+	font-weight : bold;
+}
+
+tfoot {
+	font-weight : bold;
+}
+
+tfoot td, tfoot td:last-child {
+	background-color : #EEEEEE;	
+	border-right : 1px solid #666666;
+	border-bottom : 1px solid #666666;
+}
+
+td.credit, td.debit, td.sum {
+	font-family : "Courier New", Courier, monospace;
+	text-align : right;
+}
+
+td.debit {
+	color : #990000;
+}
+
+#receipt {
+	background-color : #FFFFFF;
+	font-family : serif;
+	font-size : .9em;
+	margin : 0 0px 0px 0;
+	padding : 0px;
+	position : relative;
+}
+
+#receipt a:link {
+	color : #000066;
+	text-decoration: none;
+}
+
+#receipt a:visited {
+	color : #000066;
+	text-decoration: none;
+}
+
+#receipt a:hover {
+	color : #993300;
+	text-decoration: none;
+}
+
+#receipt caption {
+	color : #000000;
+	font-weight : bold;
+	margin-top : 5px;
+	text-align : left;
+}
+
+#receipt div.table {
+	background-color : transparent;
+	font-weight: normal;
+}
+
+#receipt h3, #receipt caption {
+	background-color : transparent;
+	color : #000000;
+	font-size : 1em;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+#receipt table {
+	background-color : transparent;
+	border : 0;
+	border-collapse : collapse;
+	width : auto;
+}
+
+#receipt td, #receipt th {
+	background-color : transparent;
+	border : 0;
+	font-size : 1em;
+	font-weight : normal;
+	padding : 1px;
+	}
+	
+#receipt th {
+	font-weight : bold;
+	text-align : left;
+	}
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index ba830d54c6..d9fd7324ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -498,9 +498,13 @@ fieldset.brief label {
 	padding : .3em 0;
 }
 
+fieldset.brief ol, fieldset.brief li {
+	list-style-type : none;
+}
+
 fieldset.brief div.hint {
 	color : #999999;
-	font-size : 80%;
+	font-size : 90%;
 	margin-bottom : .4em;
 }
 
@@ -725,21 +729,21 @@ fieldset.rows .inputnote {
 	background-repeat : no-repeat;
 }
 
-#deletebiblio a, #deletepatron a {
+#deletebiblio button, #deletebiblio a, #deletepatron a {
 	padding-left : 34px;
 	background-image: url("/intranet-tmpl/prog/img/toolbar-delete.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
-#printbiblio a {
+#printbiblio button, #printbiblio a {
 	padding-left : 34px;
 	background-image: url("/intranet-tmpl/prog/img/toolbar-print.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
 }
 
-#addtoshelf a {
+#addtoshelf button, #addtoshelf a {
 	padding-left : 34px;
 	background-image: url("/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif");
 	background-position : center left;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index c63b6f4f55..7922fcba01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -1,6 +1,33 @@
 <div id="toolbar">
 	
 	<script type="text/javascript">
+	
+	function addToShelf() {	window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes');
+	}
+	function printBiblio() {window.open('/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Print_Biblio','width=700,height=500,toolbar=false,scrollbars=yes');
+	}
+function confirm_deletion() {
+		var count = <!-- TMPL_VAR NAME="count" -->;
+		if(!count){ alert("no count!");
+		return false; } else {
+		alert(count);
+		}
+        var is_confirmed;
+	if (count>0){
+		    is_confirmed= alert(_('There are [ '+ count +' ] item(s) attached to this record \n You must delete all items before deleting this record.'));
+		    } else{
+		    is_confirmed= confirm(_('Are you sure you want to delete this record? '));
+	}
+   
+     if (is_confirmed) {
+        if (count>0){
+// 	window.location="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+	} else {
+	window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+	}
+		
+    }
+}
 	//<![CDATA[
 
 	// prepare DOM for YUI Toolbar
@@ -8,7 +35,10 @@
 	 $(document).ready(function() {
 	    $("#edititems").parent().remove();
 	    $("#duplicatebiblio").parent().remove();
-	    $("#editmenucontainer").empty();
+	    $("#editmenuc").empty();
+		$("#addtoshelfc").empty();
+		$("#printbiblioc").empty();
+		$("#deletebiblioc").empty();
 	    yuiToolbar();
 	 });
 
@@ -26,17 +56,36 @@
 	        label: "Edit",
 	        name: "editmenubutton",
 	        menu: editmenu,
-	        container: "editmenucontainer"
-	    });   
+	        container: "editmenuc"
+	    });
+		
+		var deletebiblioButton = new YAHOO.widget.Button({
+                                            id: "deletebiblio", 
+                                            type: "button", 
+                                            label: "Delete", 
+                                            container: "deletebiblioc",
+											onclick: {fn: confirm_deletion }
+                                        });
+												
+		var addtoshelfButton = new YAHOO.widget.Button({
+                                            id: "addtoshelf", 
+                                            type: "button", 
+                                            label: "Add to Shelf", 
+                                            container: "addtoshelfc",
+											onclick: {fn: addToShelf }
+                                        });
+										
+		var printbiblioButton = new YAHOO.widget.Button({
+                                            id: "printbiblio", 
+                                            type: "button", 
+                                            label: "Print", 
+                                            container: "printbiblioc",
+											onclick: {fn: printBiblio }
+                                        });
 
-	    new YAHOO.widget.Button("addbiblio");
-	    new YAHOO.widget.Button("editbiblio");
-	    new YAHOO.widget.Button("edititems");
-	    new YAHOO.widget.Button("duplicatebiblio");
-	    new YAHOO.widget.Button("deletebiblio");
-	    new YAHOO.widget.Button("addtoshelf");
-	    new YAHOO.widget.Button("printbiblio");
-	    new YAHOO.widget.Button("placehold");		 
+	    var addbiblioButton = new YAHOO.widget.Button("addbiblio");
+	    var placeholdButton = new YAHOO.widget.Button("placehold");
+		
 	}
 
 	//]]>
@@ -45,12 +94,12 @@
 <ul class="toolbar">
 
 	<li><a id="addbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li>
-	<li id="editmenucontainer"><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
+	<li id="editmenuc"><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
 	<li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
 	<li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate Record</a></li>
-	<li><a id="deletebiblio" href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Delete</a></li>
-	<li><a id="addtoshelf" href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf</a></li>
-	<li><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
+	<li id="deletebiblioc"><a id="deletebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a></li>
+	<li id="addtoshelfc"><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add to shelf</a></li>
+	<li id="printbiblioc"><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
         <!-- TMPL_UNLESS name="bi_notforloan" -->
 	<!-- TMPL_UNLESS NAME="norequests" --><li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_UNLESS --><!-- TMPL_UNLESS -->
 </ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index 0c876b96c7..ba867b3c44 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -3,7 +3,7 @@
 	//<![CDATA[
 
 function confirm_deletion() {
-    var is_confirmed = window.confirm('Click OK to confirm deletion');
+    var is_confirmed = window.confirm('Are you sure you want to delete this patron? This cannot be undone.');
     var borrowernumbervalue=document.form.borrowernumber.value; 
    
     if (is_confirmed) {
@@ -12,7 +12,7 @@ function confirm_deletion() {
 }
 
 function confirm_reregistration() {
-    var is_confirmed = window.confirm('Click OK to confirm renewal');
+    var is_confirmed = window.confirm('Are you sure you want to renew this patron\'s registration?');
     var borrowernumbervalue1=document.form.borrowernumber.value;
     if (is_confirmed) {
     window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
@@ -35,13 +35,13 @@ function confirm_reregistration() {
 	function yuiToolbar() {
 	    var printmenu = [
 	        { text: "Print Page", url: "/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" },
-	        { text: "Print Slip", handler: confirm_reregistration }
+	        { text: "Print Slip", url: "/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" }
 	    ];
 	
 		var moremenu = [
-			{ text: "Renew Patron", url: "/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"},
+			{ text: "Renew Patron",  onclick: { fn: confirm_reregistration } },
 			{ text: "Set Permissions", url: "/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->"},
-			{ text: "Delete", url: "javascript:confirm_deletion();"},
+			{ text: "Delete", onclick: { fn: confirm_deletion } },
 		]
 
 	    new YAHOO.widget.Button({
@@ -90,9 +90,9 @@ function confirm_reregistration() {
                 <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=A">Edit</a></li>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
-	<li><a id="addnote" href="Someone please write this">Add Note</a></li>
+	<li><a id="addnote" href="/cgi-bin/koha/members/addnotes.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Add Note</a></li>
 	<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li>
 	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">Print Page</a></li>
 	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">Print Slip</a></li>
-	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">Renew Account</a></li><!-- TMPL_IF NAME="CAN_user_permission" --><li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set Permissions</a></li><!-- /TMPL_IF --><li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
+	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew Account</a></li><!-- TMPL_IF NAME="CAN_user_permission" --><li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set Permissions</a></li><!-- /TMPL_IF --><li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
 </ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
new file mode 100644
index 0000000000..7033bb93fb
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -0,0 +1,43 @@
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	 	$("#addchild").parent().remove();
+		$("#addprofessional").parent().remove();
+		$("#addorganisation").parent().remove();
+	    $("#newmenuc").empty();
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+
+		var newmenu = [
+			{ text: "Adult Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A" },
+			{ text: "Child Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C" },
+			{ text: "Professional Patron",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P" },
+			{ text: "Organisation",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I" },
+		] 
+	
+	    new YAHOO.widget.Button({
+	        type: "menu",
+	        label: "New",
+	        name: "newmenubutton",
+	        menu: newmenu,
+	        container: "newmenuc"
+	    });
+	
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li id="newmenuc"><a id="addadult" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Adult</a></li>
+<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Child</a></li>
+<li><a id="addprofessional" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Professional</a></li>
+<li><a id="addorganisation" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Organisation</a></li>
+</ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
index 8a47844cee..5f8f1aec0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -2,32 +2,6 @@
 <title>Koha &rsaquo; Catalogue &rsaquo; ISBD Details for <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
-<script language="javascript" type="text/javascript">
-function Dopop(link) {
-    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
-}
-
-function confirm_deletion(count) {
-        var is_confirmed;
-	if (count>0){
-		    is_confirmed= alert('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio');
-		    }
-        else{
-		    is_confirmed= confirm('Are you sure you want to delete this biblio? ');
-	}
-
-    
-     if (is_confirmed) {
-        if (count>0){
-// 	window.location="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-	}
-	else{
-	window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-	}
-    }
-}
-
-</script>
 </head>
 <body class="yui-skin-sam">
 
@@ -56,7 +30,6 @@ function confirm_deletion(count) {
 </div>
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 6ff29aaf95..f7071320b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -3,34 +3,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 <script type="text/javascript">
-
 //<![CDATA[
 
 	 $(document).ready(function() {
  		$('#bibliotabs').tabs();
 	 });
 
-function confirm_deletion(count) {
-
-	 var is_confirmed;
-	if (count>0){
-		is_confirmed= alert('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio');
-	}
-    else{
-		    is_confirmed= confirm('Are you sure you want to delete this biblio? ');
-	}
-
-     if (is_confirmed) {
-        if (count=0){
-			window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-		}
-    }
-}
-
-function Dopop(link) {
-    window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
-}
-
 function Changefwk(FwkList) {
 	var fwk = FwkList.options[FwkList.selectedIndex].value;
 	window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
@@ -419,7 +397,6 @@ function Changefwk(FwkList) {
 </div>
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 88007d2ee0..e8e0d5da83 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -2,33 +2,6 @@
 <title>Koha &rsaquo; Catalogue &rsaquo; Details for <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
-<script type="text/javascript">
-//<![CDATA[
-function Dopop(link) {
-    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
-}
-function confirm_deletion(count) {
-        var is_confirmed;
-	if (count>0){
-		    is_confirmed= alert(_('There are [ '+ count +' ] item(s) attached to this record \n You must delete all items before deleting this record.'));
-		    }
-        else{
-		    is_confirmed= confirm(_('Are you sure you want to delete this record? '));
-	}
-
-    
-     if (is_confirmed) {
-        if (count>0){
-// 	window.location="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-	}
-	else{
-	window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-	}
-		
-    }
-}
-//]]>
-</script>
 </head>
 
 <body class="yui-skin-sam">
@@ -263,7 +236,6 @@ function confirm_deletion(count) {
 </div>
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl
new file mode 100644
index 0000000000..f316ef9e99
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl
@@ -0,0 +1,48 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Catalogue &rsaquo; Details for <!-- TMPL_VAR NAME="title" --></title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<link rel="stylesheet" href="<!-- TMPL_VAR NAME="themelang" -->/css/print.css" />
+</head>
+
+<body>
+
+<!-- main site -->
+<div id="main">
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<table class="list">
+	<caption><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></caption>
+	<tr><th>Biblio Record Number: </th><td> <!-- TMPL_VAR NAME="biblionumber" -->	</td></tr>
+<!-- TMPL_IF NAME="author" --><tr><th>Author: </th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="additional" --><tr><th>Additional Author: </th><td><!-- TMPL_VAR NAME="additional" --></td></tr><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+<!-- TMPL_IF name="publishercode" --><tr><th>Publisher: </th><td><!-- TMPL_VAR NAME="publishercode" --></td></tr><!-- /TMPL_IF -->
+<tr><th>Publication Details: </th><td>			<!-- TMPL_IF name="publicationyear" --><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --></td></tr>
+			<!-- TMPL_IF name="collection" --><tr><th>Collection:</th><td> <!-- TMPL_VAR NAME="seriestitle" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="subject" --><tr><th>Subject: </th><td><!-- TMPL_VAR NAME="subject" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="copyrightdate" --><tr><th>Copyright Date: </th><td> <!-- TMPL_VAR NAME="copyrightdate" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="notes" --><tr><th>Notes: </th><td><!-- TMPL_VAR NAME="notes" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="unititle" --><tr><th>Unititle: </th><td><!-- TMPL_VAR NAME="unititle" --></td></tr><!-- /TMPL_IF --> 
+			<!-- TMPL_IF name="dewey" --><tr><th>Dewey: </th><td><!-- TMPL_VAR name="dewey" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="classification" --><tr><th>Classification: </th><td> <!-- TMPL_VAR name="classification" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="lccn" --><tr><th>LCCN: </th><td><!-- TMPL_VAR name="lccn" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="url" --><tr><th>URL: </th><td><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="ISBN" --><tr><th>ISBN: </th><td><!-- TMPL_VAR NAME="ISBN" --></td></tr><!-- /TMPL_IF -->
+	</table>
+<!-- /TMPL_LOOP -->
+
+<table>
+	<tr><th>Item Type</th><th>Call Number</th><th>Location</th><th>Date Due</th><th>Last Seen</th><th>Barcode</th></tr>
+	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_VAR NAME="classification" --></td>
+			<td><!-- TMPL_VAR NAME="branchname" --><!-- TMPL_IF NAME="bulk" -->, <!-- TMPL_VAR NAME="bulk" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="datedue" --></td>
+			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
+			<td><!-- TMPL_VAR NAME="barcode" --></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index dd1f735fc5..423fba9098 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Account for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
+<title>Koha &rsaquo; Patrons &rsaquo; Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
@@ -13,12 +14,8 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
-<!-- The manual invoice and credit buttons -->
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" --><!-- The manual invoice and credit buttons -->
 <div id="action">
-    <div class="edit">
-        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Return to Patron Record</a>
-    </div>
     <div class="view">
         <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Pay fines</a>
         <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Invoice</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
index e100213924..84fb5f1303 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Can't Delete Patron</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
@@ -12,8 +13,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
-	<h3>Cannot Delete Patron</h3>
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->	<h3>Cannot Delete Patron</h3>
 		<ul><!-- TMPL_IF name="ItemsOnIssues" -->
 			<li>Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.</li>
 		<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
index 2e3f7513b9..060e05d89f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Borrowers &rsaquo; Create Manual Credit</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
@@ -13,21 +14,20 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
-<h2>Manual Credit</h2>
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 <form action="/cgi-bin/koha/members/mancredit.pl" method="post">
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
 
-<table>
-	<tr><th scope="row">Patron Number</th><td><!-- TMPL_VAR Name="borrowernumber" --></td></tr>
-	<tr><th scope="row">Credit Type</th><td><select name="type">
+<fieldset class="rows">
+<legend>Manual Credit</legend><ol>
+	<li><label for="type">Credit Type: </label><select name="type" id="type">
 <option value="C">Credit</option>
 <option value="F">Forgiven</option>
-</select></td></tr>
-	<tr><th scope="row">Itemnumber</th><td><input type="text" name="itemnum" /></td></tr>
-	<tr><th scope="row">Description</th><td><input type="text" name="desc" size="50" /></td></tr>
-	<tr><th scope="row">Amount</th><td>$<input type="text" name="amount" /></td></tr>
-</table>
+</select></li>
+	<li><label for="itemnum">Itemnumber: </label><input type="text" name="itemnum" id="itemnum" /></li>
+	<li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
+	<li><label for="amount">Amount: </label><input type="text" name="amount" id="amount" /></li>
+</ol></fieldset>
 
 <input type="submit" name="add" value="Add Credit" />
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
index 6b516393d2..1e1cb2f82d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Borrowers &rsaquo; Create Manual Invoice</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
@@ -13,29 +14,28 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
-<!-- TMPL_IF NAME="ERROR" -->
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" --><!-- TMPL_IF NAME="ERROR" -->
 <!-- TMPL_IF NAME="ITEMNUMBER" -->
   ERROR an invalid itemnumber was entered, please hit back and try again
 <!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
 <form action="/cgi-bin/koha/members/maninvoice.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
-	<table>
-	<caption>Manual Invoice</caption>
-	<tr><th scope="row">Borrowernumber</th><td><!-- TMPL_VAR Name="borrowernumber" --></td></tr>
-	<tr><th scope="row">Type</th><td><select name="type">
+	<fieldset class="rows">
+	<legend>Manual Invoice</legend>
+	<ol>
+	<li><label for="type">Type: </label><select name="type" id="type">
 <option value="L">Lost Item</option>
 <option value="F">Fine</option>
 <option value="A">Account Management Fee</option>
 <option value="N">New Card</option>
 <option value="M">Sundry</option>
 <option value="REF">Cash Refund</option>
-</select></td></tr>
-	<tr><th scope="row">Itemnumber</th><td><input type="text" name="itemnum" /></td></tr>
-	<tr><th scope="row">Description</th><td><input type="text" name="desc" size="50" /></td></tr>
-	<tr><th scope="row">Amount</th><td>$<input type="text" name="amount" /></td></tr>
-	</table>
-<input type="submit" name="add" value="Add Charge" />
+</select></li>
+	<li><label for="itemnum">Itemnumber: </label><input type="text" name="itemnum" id="itemnum" /></li>
+	<li><label for="desc">Description: </label><input type="text" name="desc" id="desc" size="50" /></li>
+	<li><label for="amount">Amount: </label><input type="text" name="amount" id="amount" /></li>
+	</ol></fieldset>
+<input type="submit" name="add" value="Save" />
 </form>
 
 <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" /><input type="submit" value="Cancel" /></form>
@@ -46,7 +46,7 @@
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
index e8b17d4a76..6dde676a08 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Patrons &rsaquo; Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
@@ -13,9 +14,10 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 
 <form method="post" action="/cgi-bin/koha/members/member-flags.pl">
-    <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
+    <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
     <input type="hidden" name="newflags" value="1" />
     <h1>Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></h1>
 <table>
@@ -46,7 +48,7 @@
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
index 2bcd2b1c66..1221f98b04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Patrons &rsaquo; <!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
@@ -43,7 +44,7 @@
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index f4441c63c9..65459a940f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -1,29 +1,22 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Patrons &rsaquo; Search Results</title>
+<title>Koha &rsaquo; Patrons <!-- TMPL_IF NAME="searching" -->&rsaquo; Search Results<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <!-- TMPL_IF NAME="searching" -->Search Results<!-- TMPL_ELSE -->Search<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <!-- TMPL_IF NAME="searching" --><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Search Results<!-- TMPL_ELSE -->Patrons<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
+	
+<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
 
-<form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
-    <label for="member">Search by name or barcode:</label>
-    <input id="member" type="text" size="25" name="member" />
-    order by:
-    <select name="orderby" id="orderby">
-    <option value="surname,firstname">Surname</option>
-    <option value="cardnumber">Cardnumber</option>
-    </select>
-    <input type="submit" value="Search" />
-</form>
 <div>
     Browse by last name:
     <a href="/cgi-bin/koha/members/member.pl?member=a">A</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
index e799f512d7..689e27b0d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
+<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
@@ -13,9 +14,9 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 
-<h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
-<form action="/cgi-bin/koha/members/pay.pl" method="post">
+<!-- TMPL_IF NAME="allfile" --><form action="/cgi-bin/koha/members/pay.pl" method="post">
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="borrowernumber" -->" />
 
 <table>
@@ -64,8 +65,7 @@
 <!--/TMPL_IF-->
 <!-- /TMPL_LOOP  -->
 </table>
-<input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
-<form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
+<input type="submit" name="submit"  value="Make Payment" class="submit" /></form><!-- TMPL_ELSE --><p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> has no outstanding fines.</p><!-- /TMPL_IF -->
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
index c54375c0fe..f6f99b6f92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body>
+<body class="yui-skin-sam">
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
@@ -13,7 +14,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 <!-- TMPL_IF NAME="showfulllink" -->
 <ul>
 	<li>Showing All Items</li>
diff --git a/members/member-flags.pl b/members/member-flags.pl
index 7437f6a997..bfc74b31f7 100755
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -70,7 +70,7 @@ if ($input->param('newflags')) {
 	push @loop, \%row;
     }
 
-    $template->param(member => $member,
+    $template->param(borrowernumber => $member,
 			surname => $bor->{'surname'},
 			firstname => $bor->{'firstname'},
 			loop => \@loop,