diff --git a/framework/default/ortoo-core/default/labels/ortoo-core-CustomLabels.labels-meta.xml b/framework/default/ortoo-core/default/labels/ortoo-core-CustomLabels.labels-meta.xml
index ad4330c28cd..3db34357c4a 100644
--- a/framework/default/ortoo-core/default/labels/ortoo-core-CustomLabels.labels-meta.xml
+++ b/framework/default/ortoo-core/default/labels/ortoo-core-CustomLabels.labels-meta.xml
@@ -140,4 +140,53 @@
         <shortDescription>The title that is used on search buttons.</shortDescription>
         <value>Apply Filters</value>
     </labels>
+    <labels>
+        <fullName>ortoo_core_first_page</fullName>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>The label to use on the 'First Page' button of the pagination controls.</shortDescription>
+        <value>First Page</value>
+    </labels>
+    <labels>
+        <fullName>ortoo_core_previous_page</fullName>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>The label to use on the 'Previous Page' button of the pagination controls.</shortDescription>
+        <value>Previous</value>
+    </labels>
+    <labels>
+        <fullName>ortoo_core_next_page</fullName>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>The label to use on the 'Next Page' button of the pagination controls.</shortDescription>
+        <value>Next</value>
+    </labels>
+    <labels>
+        <fullName>ortoo_core_last_page</fullName>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>The label to use on the 'Last Page' button of the pagination controls.</shortDescription>
+        <value>Last Page</value>
+    </labels>
+    <labels>
+        <fullName>ortoo_core_total_records</fullName>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>The label that is used with a 'Total Records' count.</shortDescription>
+        <value>Total Records</value>
+    </labels>
+    <labels>
+        <fullName>ortoo_core_page_size</fullName>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>The label that is used with a 'Page Size' count.</shortDescription>
+        <value>Page Size</value>
+    </labels>
+    <labels>
+        <fullName>ortoo_core_page_number_description</fullName>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>Describes the page no. of a total. {0} - Current Page, {1} - Total Pages.</shortDescription>
+        <value>Page {0} of {1}</value>
+    </labels>
 </CustomLabels>
\ No newline at end of file
diff --git a/framework/default/ortoo-core/default/lwc/filterAndResults/filterAndResults.html b/framework/default/ortoo-core/default/lwc/filterAndResults/filterAndResults.html
index 81b95125227..723763c9a4d 100644
--- a/framework/default/ortoo-core/default/lwc/filterAndResults/filterAndResults.html
+++ b/framework/default/ortoo-core/default/lwc/filterAndResults/filterAndResults.html
@@ -47,6 +47,7 @@
 
                     <lightning-layout-item>
                         <c-pagination-controls
+                            if:true={showPaginationControls}
                             ortoo-elem-id-prefix={pageSelectorTopId}
                             number-of-records={numberOfRecords}
                             records-per-page={recordsPerPage}
@@ -69,6 +70,7 @@
 
                     <lightning-layout-item>
                         <c-pagination-controls
+                            if:true={showPaginationControls}
                             ortoo-elem-id-prefix={pageSelectorTopId}
                             number-of-records={numberOfRecords}
                             records-per-page={recordsPerPage}
diff --git a/framework/default/ortoo-core/default/lwc/filterAndResults/filterAndResults.js b/framework/default/ortoo-core/default/lwc/filterAndResults/filterAndResults.js
index 1ecfb94ef8b..0ff02ad8eac 100644
--- a/framework/default/ortoo-core/default/lwc/filterAndResults/filterAndResults.js
+++ b/framework/default/ortoo-core/default/lwc/filterAndResults/filterAndResults.js
@@ -26,6 +26,7 @@ export default class FilterAndResults extends LightningElement {
     @api numberOfRecords;
     @api recordsPerPage;
     @api currentPage;
+    @api showPaginationControls;
 
     connectedCallback() {
         configureElementIdGenerator( this );
diff --git a/framework/default/ortoo-core/default/lwc/paginationControls/paginationControls.js b/framework/default/ortoo-core/default/lwc/paginationControls/paginationControls.js
index 3452f3c9cd7..d771c746b93 100644
--- a/framework/default/ortoo-core/default/lwc/paginationControls/paginationControls.js
+++ b/framework/default/ortoo-core/default/lwc/paginationControls/paginationControls.js
@@ -1,23 +1,20 @@
 import { LightningElement, api, wire } from 'lwc';
 import configureElementIdGenerator from 'c/elementIdGenerator';
 
-import pageSizeOptions from '@salesforce/apex/UsersComponentController.pageSizeOptions';
-
-//import XXX_LABEL from '@salesforce/label/c.ortoo_core_xxxx';
-
-const FIRST_LABEL = 'First Page'; // labels, as per above
-const PREVIOUS_LABEL = 'Previous';
-const NEXT_LABEL = 'Next';
-const LAST_LABEL = 'Last Page';
-const TOTAL_RECORDS_LABEL = 'Total records';
-const PAGE_DESCRIPTION = 'Page {0} of {1}';
-const PAGE_SIZE_LABEL = 'Page Size';
+import FIRST_LABEL from '@salesforce/label/c.ortoo_core_first_page';
+import PREVIOUS_LABEL from '@salesforce/label/c.ortoo_core_previous_page';
+import NEXT_LABEL from '@salesforce/label/c.ortoo_core_next_page';
+import LAST_LABEL from '@salesforce/label/c.ortoo_core_last_page';
+import TOTAL_RECORDS_LABEL from '@salesforce/label/c.ortoo_core_total_records';
+import PAGE_SIZE_LABEL from '@salesforce/label/c.ortoo_core_page_size';
+import PAGE_DESCRIPTION from '@salesforce/label/c.ortoo_core_page_number_description';
 
 export default class PaginationControls extends LightningElement {
 
+    // TODO: errors on trying to navigate if these are not set
     @api numberOfRecords;
     @api recordsPerPage;
-    @api currentPage;
+    @api currentPage = 1;
 
     labels = {
         first: FIRST_LABEL,
@@ -38,7 +35,13 @@ export default class PaginationControls extends LightningElement {
         pageSizeId: 'pagesize',
     }
 
-    @wire(pageSizeOptions, {}) pageSizeOptions;
+    // Could potentially be loaded from the DB, but I'm not sure why you need to
+    pageSizeOptions = [
+        { label: '20', value: 20 },
+        { label: '50', value: 50 },
+        { label: '100', value: 100 },
+        { label: '200', value: 200 },
+    ];
 
     connectedCallback() {
         configureElementIdGenerator( this );
@@ -62,20 +65,24 @@ export default class PaginationControls extends LightningElement {
         return this.currentPage >= this.numberOfPages;
     }
 
+    get initialised() {
+        return this.numberOfRecords && this.recordsPerPage && this.currentPage;
+    }
+
     get disableFirstButton() {
-        return this.onFirstPage;
+        return this.initialised && this.onFirstPage;
     }
 
     get disablePreviousButton() {
-        return this.onFirstPage;
+        return this.initialised && this.onFirstPage;
     }
 
     get disableNextButton() {
-        return this.onLastPage;
+        return this.initialised && this.onLastPage;
     }
 
     get disableLastButton() {
-        return this.onLastPage;
+        return this.initialised && this.onLastPage;
     }
 
     handleFirstClick( event ) {