diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
index ecbdf95..87342da 100644
--- a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
@@ -33,6 +33,7 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
             hidePaginator : false,
             showLoadFilter : false,
             suppressLinkedFields : null, // list of fields whose linked display data should not be fetched from the server
+            showBackForward : true,
 
             /* by default, don't show auto-generated (sequence) fields */
             showSequenceFields : false, 
@@ -85,32 +86,37 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
                     this.paginator = new dijit.layout.ContentPane();
 
 
-                    var back = dojo.create('a', {
-                        innerHTML : 'Back',  // TODO i18n
-                        style : 'padding-right:6px;',
-                        href : 'javascript:void(0);', 
-                        onclick : function() { 
-                            self.cachedQueryOpts.offset = self.displayOffset -= self.displayLimit;
-                            if(self.displayOffset < 0)
-                                self.cachedQueryOpts.offset = self.displayOffset = 0;
-                            self.refresh();
-                        }
-                    });
-
-                    var forw = dojo.create('a', {
-                        innerHTML : 'Next',  // TODO i18n
-                        style : 'padding-right:6px;',
-                        href : 'javascript:void(0);', 
-                        onclick : function() { 
-                            self.cachedQueryOpts.offset = self.displayOffset += self.displayLimit;
-                            self.refresh();
-                        }
-                    });
-
                     dojo.place(this.paginator.domNode, this.domNode, 'before');
-                    dojo.place(back, this.paginator.domNode);
-                    dojo.place(forw, this.paginator.domNode);
+                    
+                    if(this.showBackForward) {
+                        if(this.displayLimit != null) { //Don't show back or forward if we are displaying all rows.
+                            var back = dojo.create('a', {
+                                innerHTML : 'Back',  // TODO i18n
+                                style : 'padding-right:6px;',
+                                href : 'javascript:void(0);', 
+                                onclick : function() { 
+                                    self.cachedQueryOpts.offset = self.displayOffset -= self.displayLimit;
+                                    if(self.displayOffset < 0)
+                                        self.cachedQueryOpts.offset = self.displayOffset = 0;
+                                    self.refresh();
+                                }
+                            });
 
+                            var forw = dojo.create('a', {
+                                innerHTML : 'Next',  // TODO i18n
+                                style : 'padding-right:6px;',
+                                href : 'javascript:void(0);', 
+                                onclick : function() { 
+                                    self.cachedQueryOpts.offset = self.displayOffset += self.displayLimit;
+                                    self.refresh();
+                                }
+                            });
+                        
+                            dojo.place(back, this.paginator.domNode);
+                            dojo.place(forw, this.paginator.domNode);
+                        }
+                    }
+                    
                     if(this.showLoadFilter) {
                         dojo.require('openils.widget.PCrudFilterDialog');
                         dojo.place(
@@ -576,10 +582,14 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
                 if(this.loadProgressIndicator)
                     dojo.style(this.loadProgressIndicator, 'visibility', 'visible');
                 var self = this;
-                opts = dojo.mixin(
-                    {limit : this.displayLimit, offset : this.displayOffset}, 
-                    opts || {}
-                );
+                
+                if(this.displayLimit != null) {
+                    opts = dojo.mixin(
+                        {limit : this.displayLimit, offset : this.displayOffset}, 
+                        opts || {}
+                    );
+                }
+                
                 opts = dojo.mixin(opts, {
                     async : true,
                     streaming : true,
diff --git a/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js b/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js
index 6e8dd50..b3ad60b 100644
--- a/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js
+++ b/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js
@@ -1,4 +1,5 @@
 dojo.require('dijit.layout.ContentPane');
+dojo.require('dijit.layout.LayoutContainer');
 dojo.require('dijit.form.Button');
 dojo.require('openils.widget.AutoGrid');
 dojo.require('openils.widget.AutoFieldWidget');
@@ -207,3 +208,17 @@ function applyCircModChanges() {
 
 openils.Util.addOnLoad(load);
 
+function format_hard_due_date(name, id) {
+    var item=this.grid.getItem(id);
+    if(!item) return name;
+    switch (this.grid.store.getValue(this.grid.getItem(id), 'hard_due_date')) {
+        case null :
+        case undefined :
+        case 'unset' :
+            return name;
+        default:
+            return "<a href='" + oilsBasePath +
+                "/conify/global/config/hard_due_date?name=" +
+                encodeURIComponent(name) + "'>" + name + "</a>";
+    }
+}
\ No newline at end of file
diff --git a/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2 b/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
index e3725a2..5866e5f 100644
--- a/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
@@ -1,13 +1,14 @@
 [% ctx.page_title = 'Circulation Policy Configuration' %]
 [% WRAPPER default/base.tt2 %]
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/circ_matrix_matchpoint.js'> </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel' id='topContentPane'>
     <div>Circulation Policy Configuration</div>
     <div><button dojoType='dijit.form.Button' onClick='cmGrid.showCreatePane()'>New</button></div>
 </div>
+
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <table  jsId="cmGrid"
-            style="height: 600px;"
+            style="height: 500px;"
             dojoType="openils.widget.AutoGrid"
             fieldOrder="['id', 'active', 'grp', 'org_unit', 'copy_circ_lib', 'copy_owning_lib', 'user_home_ou', 'is_renewal', 'juvenile_flag', 'circ_modifier', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format', 'ref_flag', 'usr_age_lower_bound', 'usr_age_upper_bound', 'item_age', 'circulate', 'duration_rule', 'renewals', 'hard_due_date', 'recurring_fine_rule', 'grace_period', 'max_fine_rule', 'available_copy_hold_ratio', 'total_copy_hold_ratio', 'script_test']"
             defaultCellWidth='"auto"'
@@ -16,24 +17,28 @@
             editStyle='pane'
             editOnEnter='true'
             showColumnPicker='true'
+            hideSelector='true'
+            showBackForward='false'
+            showLoadFilter='true'
+            displayLimit='null'
             columnPickerPrefix='"conify.config.circ_matrix_matchpoint"'>
             <thead>
                 <tr>
-                    <th field="hard_due_date" formatter="format_hard_due_date">
-                    </th>
+                    <th field='hard_due_date' formatter='format_hard_due_date' />
                 </tr>
             </thead>
     </table>
 </div>
-
 <div class='hidden'>
     <div id='circ-mod-editor' style='border:1px solid #aaa'>
         <h3>Circ Modifier Count Groups</h3>
         <table class='oils-generic-table' name='circ-mod-group-table'>
-            <tbody><tr>
-                <td>Total items out</td>
-                <td><input type='text' size='3' name='circ-mod-count'></div></td>
-            </tr><tbody>
+            <tbody>
+                <tr>
+                    <td>Total items out</td>
+                    <td><input type='text' size='3' name='circ-mod-count'/></td>
+                </tr>
+            <tbody>
             <tbody name='circ-mod-entry-tbody'>
                 <tr name='circ-mod-entry-row'>
                     <td name='circ-mod'/>
@@ -42,36 +47,20 @@
             </tbody>
             <tbody>
                 <tr>
-                    <td><div name='circ-mod-selector'></div></td>
+                    <td><div name='circ-mod-selector'/></td>
                     <td><a href='javascript:void(0);' name='add-circ-mod'>Add</a></td>
                 </tr>
             </tbody>
         </table>
         <span name='add-circ-mod-group-span'>
-        <a href='javascript:void(0);' name='add-circ-mod-group'>Create New Group</a>
-        </span>&nbsp;&nbsp;<span>
-        <a href='javascript:void(0);' onclick='applyCircModChanges()'>Apply Circ Modifier Changes</a>
+            <a href='javascript:void(0);' name='add-circ-mod-group'>Create New Group</a>
+        </span>&nbsp;&nbsp;
+        <span>
+            <a href='javascript:void(0);' onclick='applyCircModChanges()'>Apply Circ Modifier Changes</a>
         </span>
     </div>
 </div>
 
 <div class='hidden'><div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'/></div>
 
-<script type="text/javascript">
-    function format_hard_due_date(name, id) {
-        var item=this.grid.getItem(id);
-        if(!item) return name;
-        switch (this.grid.store.getValue(this.grid.getItem(id), 'hard_due_date')) {
-            case null :
-            case undefined :
-            case 'unset' :
-                return name;
-            default:
-                return "<a href='" + oilsBasePath +
-                    "/conify/global/config/hard_due_date?name=" +
-                    encodeURIComponent(name) + "'>" + name + "</a>";
-        }
-    }
-</script>
 [% END %]
-