diff --git a/classes/output/mobile.php b/classes/output/mobile.php
index 67bf9e64..0e3d0d28 100644
--- a/classes/output/mobile.php
+++ b/classes/output/mobile.php
@@ -40,7 +40,7 @@ public static function mobile_view_activity($args) {
 
         $args = (object) $args;
 
-        $versionname = $args->appversioncode >= 3950 ? 'latest' : 'ionic3';
+        $versionname = $args->appversioncode >= 44000 ? 'latest' : 'ionic5';
         $cmid = $args->cmid;
         $rid = isset($args->rid) ? $args->rid : 0;
         $action = isset($args->action) ? $args->action : 'index';
diff --git a/templates/local/mobile/ionic3/boolean_question.mustache b/templates/local/mobile/ionic5/boolean_question.mustache
similarity index 85%
rename from templates/local/mobile/ionic3/boolean_question.mustache
rename to templates/local/mobile/ionic5/boolean_question.mustache
index a96fa2f8..1d5958dd 100644
--- a/templates/local/mobile/ionic3/boolean_question.mustache
+++ b/templates/local/mobile/ionic5/boolean_question.mustache
@@ -43,11 +43,11 @@
     }
 }}
 {{=<% %>=}}
-<ion-list radio-group [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
+<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
     <%#choices%>
-    <ion-item>
+    <ion-item class="ion-text-wrap">
         <ion-label><core-format-text text="<%content%>"></core-format-text></ion-label>
-        <ion-radio<%#completed%> disabled="true"<%#value%> checked="true"<%/value%><%/completed%> value="<%id%>"></ion-radio>
+        <ion-radio slot="end"<%#completed%> disabled="true"<%#value%> checked="true"<%/value%><%/completed%> [value]="<%id%>"></ion-radio>
     </ion-item>
     <%/choices%>
-</ion-list>
\ No newline at end of file
+</ion-radio-group>
\ No newline at end of file
diff --git a/templates/local/mobile/ionic3/checkbox_question.mustache b/templates/local/mobile/ionic5/checkbox_question.mustache
similarity index 63%
rename from templates/local/mobile/ionic3/checkbox_question.mustache
rename to templates/local/mobile/ionic5/checkbox_question.mustache
index 615a4f42..0a769fbd 100644
--- a/templates/local/mobile/ionic3/checkbox_question.mustache
+++ b/templates/local/mobile/ionic5/checkbox_question.mustache
@@ -44,27 +44,19 @@
     }
 }}
 {{=<% %>=}}
-<ion-list radio-group>
+<ion-list>
     <%#choices%>
-    <ion-grid no-padding>
-        <ion-row>
-            <ion-col>
-                <ion-item>
-                    <ion-label><core-format-text text="<%content%>"></core-format-text></ion-label>
-                    <ion-checkbox <%#value%> checked="true"<%/value%> value="<%id%>"
-                    <%#completed%> disabled="true"<%/completed%>
-                    [(ngModel)]="CONTENT_OTHERDATA.<%choicefieldkey%>"></ion-checkbox>
-                </ion-item>
-            </ion-col>
-            <%#otherchoicekey%>
-            <ion-col>
-                <ion-item>
-                    <ion-input placeholder="Enter: " [(ngModel)]="CONTENT_OTHERDATA.<%otherchoicekey%>"
-                    <%#completed%> disabled="true"<%/completed%>></ion-input>
-                </ion-item>
-            </ion-col>
-            <%/otherchoicekey%>
-        </ion-row>
-    </ion-grid>
+        <ion-item>
+            <ion-label><core-format-text text="<%content%>"></core-format-text></ion-label>
+            <ion-checkbox <%#value%> checked="true"<%/value%> value="<%id%>"
+            <%#completed%> disabled="true"<%/completed%>
+            [(ngModel)]="CONTENT_OTHERDATA.<%choicefieldkey%>"></ion-checkbox>
+        </ion-item>
+        <%#otherchoicekey%>
+            <ion-item>
+                <ion-input placeholder="Enter: " [(ngModel)]="CONTENT_OTHERDATA.<%otherchoicekey%>"
+                <%#completed%> disabled="true"<%/completed%>></ion-input>
+            </ion-item>
+        <%/otherchoicekey%>
     <%/choices%>
 </ion-list>
\ No newline at end of file
diff --git a/templates/local/mobile/ionic3/date_question.mustache b/templates/local/mobile/ionic5/date_question.mustache
similarity index 88%
rename from templates/local/mobile/ionic3/date_question.mustache
rename to templates/local/mobile/ionic5/date_question.mustache
index 7aef5c81..460c17f5 100644
--- a/templates/local/mobile/ionic3/date_question.mustache
+++ b/templates/local/mobile/ionic5/date_question.mustache
@@ -31,10 +31,12 @@
 }}
 {{=<% %>=}}
 <ion-item>
+    <ion-label>
+        <%#completed%>
+        <core-format-text text="{{ CONTENT_OTHERDATA.<%fieldkey%> }}"></core-format-text>
+        <%/completed%>
+    </ion-label>
     <%^completed%>
     <ion-datetime displayFormat="DD/MM/YYYY" max="2100-12-31" [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>"></ion-datetime>
     <%/completed%>
-    <%#completed%>
-    <ion-note><core-format-text text="{{ CONTENT_OTHERDATA.<%fieldkey%> }}"></core-format-text></ion-note>
-    <%/completed%>
 </ion-item>
diff --git a/templates/local/mobile/ionic3/main_index_page.mustache b/templates/local/mobile/ionic5/main_index_page.mustache
similarity index 84%
rename from templates/local/mobile/ionic3/main_index_page.mustache
rename to templates/local/mobile/ionic5/main_index_page.mustache
index 06e87f7b..249b951e 100644
--- a/templates/local/mobile/ionic3/main_index_page.mustache
+++ b/templates/local/mobile/ionic5/main_index_page.mustache
@@ -92,16 +92,16 @@
     <ion-card>
         <ion-card-content>
             <%#resume%>
-            <button ion-button core-site-plugins-new-content component="mod_questionnaire" method="mobile_view_activity"
-                    [args]="{cmid: <%cmid%>, action: 'resume'}">
+            <ion-button expand="block" core-site-plugins-new-content component="mod_questionnaire"
+                    method="mobile_view_activity" [args]="{cmid: <%cmid%>, action: 'resume'}">
                 {{ 'plugin.mod_questionnaire.resumesurvey' | translate }}
-            </button>
+            </ion-button>
             <%/resume%>
             <%^resume%>
-            <button ion-button core-site-plugins-new-content component="mod_questionnaire" method="mobile_view_activity"
-                    [args]="{cmid: <%cmid%>, action: 'respond'}">
+            <ion-button expand="block" core-site-plugins-new-content component="mod_questionnaire"
+                    method="mobile_view_activity" [args]="{cmid: <%cmid%>, action: 'respond'}">
                 {{ 'plugin.mod_questionnaire.answerquestions' | translate }}
-            </button>
+            </ion-button>
             <%/resume%>
         </ion-card-content>
     </ion-card>
@@ -110,10 +110,12 @@
     <ion-card>
         <ion-card-content>
             <%#submissions%>
-            <a ion-item core-site-plugins-new-content component="mod_questionnaire" method="mobile_view_activity"
+            <ion-item button core-site-plugins-new-content component="mod_questionnaire" method="mobile_view_activity"
                 [args]="{cmid: <%cmid%>, action: 'review', submissionid: <%submissionid%>}">
-                {{ 'plugin.mod_questionnaire.submitted' | translate }} <%submissiondate%>
-            </a>
+                <ion-label>
+                    {{ 'plugin.mod_questionnaire.submitted' | translate }} <%submissiondate%>
+                </ion-label>
+            </ion-item>
             <%/submissions%>
         </ion-card-content>
     </ion-card>
diff --git a/templates/local/mobile/ionic3/numeric_question.mustache b/templates/local/mobile/ionic5/numeric_question.mustache
similarity index 88%
rename from templates/local/mobile/ionic3/numeric_question.mustache
rename to templates/local/mobile/ionic5/numeric_question.mustache
index ef7663d8..f2988460 100644
--- a/templates/local/mobile/ionic3/numeric_question.mustache
+++ b/templates/local/mobile/ionic5/numeric_question.mustache
@@ -31,10 +31,12 @@
 }}
 {{=<% %>=}}
 <ion-item>
+    <ion-label>
+        <%#completed%>
+        <core-format-text text="{{ CONTENT_OTHERDATA.<%fieldkey%> }}"></core-format-text>
+        <%/completed%>
+    </ion-label>
     <%^completed%>
     <ion-input type="number" [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>"></ion-input>
     <%/completed%>
-    <%#completed%>
-    <ion-note><core-format-text text="{{ CONTENT_OTHERDATA.<%fieldkey%> }}"></core-format-text></ion-note>
-    <%/completed%>
 </ion-item>
\ No newline at end of file
diff --git a/templates/local/mobile/ionic3/radio_question.mustache b/templates/local/mobile/ionic5/radio_question.mustache
similarity index 62%
rename from templates/local/mobile/ionic3/radio_question.mustache
rename to templates/local/mobile/ionic5/radio_question.mustache
index d530132d..3d57c2f7 100644
--- a/templates/local/mobile/ionic3/radio_question.mustache
+++ b/templates/local/mobile/ionic5/radio_question.mustache
@@ -43,27 +43,19 @@
     }
 }}
 {{=<% %>=}}
-<ion-list radio-group [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
+<ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
     <%#choices%>
-    <ion-grid no-padding>
-        <ion-row>
-            <ion-col>
-                <ion-item>
-                    <ion-label><core-format-text text="<%content%>"></core-format-text></ion-label>
-                    <ion-radio<%#value%> checked="true"<%/value%>
-                    value="<%id%>"
-                    <%#completed%> disabled="true"<%/completed%>></ion-radio>
-                </ion-item>
-            </ion-col>
-            <%#otherchoicekey%>
-            <ion-col>
-                <ion-item>
-                    <ion-input placeholder="Enter: " [(ngModel)]="CONTENT_OTHERDATA.<%otherchoicekey%>"
-                    <%#completed%> disabled="true"<%/completed%>></ion-input>
-                </ion-item>
-            </ion-col>
-            <%/otherchoicekey%>
-        </ion-row>
-    </ion-grid>
+        <ion-item class="ion-text-wrap">
+            <ion-label><core-format-text text="<%content%>"></core-format-text></ion-label>
+            <ion-radio<%#value%> checked="true"<%/value%>
+            value="<%id%>"
+            <%#completed%> disabled="true"<%/completed%>></ion-radio>
+        </ion-item>
+        <%#otherchoicekey%>
+            <ion-item class="ion-text-wrap">
+                <ion-input placeholder="Enter: " [(ngModel)]="CONTENT_OTHERDATA.<%otherchoicekey%>"
+                <%#completed%> disabled="true"<%/completed%>></ion-input>
+            </ion-item>
+        <%/otherchoicekey%>
     <%/choices%>
-</ion-list>
\ No newline at end of file
+</ion-radio-group>
\ No newline at end of file
diff --git a/templates/local/mobile/ionic3/rate_question.mustache b/templates/local/mobile/ionic5/rate_question.mustache
similarity index 64%
rename from templates/local/mobile/ionic3/rate_question.mustache
rename to templates/local/mobile/ionic5/rate_question.mustache
index afd8e309..1d4eca2d 100644
--- a/templates/local/mobile/ionic3/rate_question.mustache
+++ b/templates/local/mobile/ionic5/rate_question.mustache
@@ -60,7 +60,7 @@
 {{=<% %>=}}
 <ion-list>
     <ion-grid>
-        <ion-row justify-content-center align-items-center text-center>
+        <ion-row class="ion-align-items-center ion-justify-content-center ion-text-center">
             <%#choices.0%>
             <%#leftlabel%>
             <ion-col></ion-col>
@@ -84,33 +84,37 @@
         </ion-row>
         <%#choices%>
         <ion-row><ion-col>
-            <ion-list-header style="margin-bottom: 0; border-top-style: none;">
-                <core-format-text text="<%content%>"></core-format-text>
-                <ion-badge item-end>{{ CONTENT_OTHERDATA.<%fieldkey%> }}</ion-badge>
-            </ion-list-header>
+            <ion-item style="margin-bottom: 0; border-top-style: none;" class="ion-text-wrap" lines="none">
+                <ion-label>
+                    <core-format-text text="<%content%>"></core-format-text>
+                </ion-label>
+                <ion-badge slot="end">{{ CONTENT_OTHERDATA.<%fieldkey%> }}</ion-badge>
+            </ion-item>
         </ion-col></ion-row>
-        <ion-row radio-group [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>" justify-content-center align-items-center text-center>
-            <%#leftlabel%>
-            <ion-col>
-                <%leftlabel%>
-            </ion-col>
-            <%/leftlabel%>
-            <%#rates%>
-            <ion-col>
-                <ion-radio value="<%label%>" <%#completed%> disabled="true"<%/completed%>></ion-radio>
-            </ion-col>
-            <%/rates%>
-            <%#hasnacolumn%>
-            <ion-col>
-                <ion-radio value="<%value%>" <%#completed%> disabled="true"<%/completed%>></ion-radio>
-            </ion-col>
-            <%/hasnacolumn%>
-            <%#rightlabel%>
-            <ion-col>
-                <%rightlabel%>
-            </ion-col>
-            <%/rightlabel%>
-        </ion-row>
+        <ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
+            <ion-row class="ion-align-items-center ion-justify-content-center ion-text-center">
+                <%#leftlabel%>
+                <ion-col>
+                    <%leftlabel%>
+                </ion-col>
+                <%/leftlabel%>
+                <%#rates%>
+                <ion-col>
+                    <ion-radio value="<%label%>" <%#completed%> disabled="true"<%/completed%>></ion-radio>
+                </ion-col>
+                <%/rates%>
+                <%#hasnacolumn%>
+                <ion-col>
+                    <ion-radio value="<%value%>" <%#completed%> disabled="true"<%/completed%>></ion-radio>
+                </ion-col>
+                <%/hasnacolumn%>
+                <%#rightlabel%>
+                <ion-col>
+                    <%rightlabel%>
+                </ion-col>
+                <%/rightlabel%>
+            </ion-row>
+        </ion-radio-group>
         <%/choices%>
     </ion-grid>
 </ion-list>
\ No newline at end of file
diff --git a/templates/local/mobile/ionic3/select_question.mustache b/templates/local/mobile/ionic5/select_question.mustache
similarity index 80%
rename from templates/local/mobile/ionic3/select_question.mustache
rename to templates/local/mobile/ionic5/select_question.mustache
index cf41de04..e609e22c 100644
--- a/templates/local/mobile/ionic3/select_question.mustache
+++ b/templates/local/mobile/ionic5/select_question.mustache
@@ -28,13 +28,11 @@
         "fieldkey": 985,
         "choices": [
             {
-                "id": 200,
                 "content": "Red",
                 "completed": 0,
                 "value": 1
             },
             {
-                "id": 201,
                 "content": "Blue",
                 "completed": 0,
                 "value": 0
@@ -43,8 +41,11 @@
     }
 }}
 {{=<% %>=}}
-<ion-select [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
-    <%#choices%>
-    <ion-option<%#completed%> disabled="true"<%/completed%><%#value%> selected="true"<%/value%> value="<%id%>"><%content%></ion-option>
-    <%/choices%>
-</ion-select>
\ No newline at end of file
+<ion-item>
+    <ion-label></ion-label>
+    <ion-select [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
+        <%#choices%>
+        <ion-select-option<%#completed%> disabled="true"<%/completed%><%#value%> selected="true"<%/value%> value="<%id%>"><%content%></ion-select-option>
+        <%/choices%>
+    </ion-select>
+</ion-item>
\ No newline at end of file
diff --git a/templates/local/mobile/ionic3/slider_question.mustache b/templates/local/mobile/ionic5/slider_question.mustache
similarity index 60%
rename from templates/local/mobile/ionic3/slider_question.mustache
rename to templates/local/mobile/ionic5/slider_question.mustache
index 27ccb7c2..80623356 100644
--- a/templates/local/mobile/ionic3/slider_question.mustache
+++ b/templates/local/mobile/ionic5/slider_question.mustache
@@ -27,27 +27,31 @@
     {
         "fieldkey": 985,
         "extradata": {
-            "minrange" : 1,
-            "maxrange" : 10,
-            "startingvalue" : 5,
-            "stepvalue" : 1,
-            "leftlabel" : "left label",
-            "rightlabel" :  "right label",
+            "minrange" : 1
+            "maxrange" : 10
+            "startingvalue" : 5
+            "stepvalue" : 1
+            "leftlabel" : "left label"
+            "rightlabel" :  "right label"
             "centerlabel": "center label"
         },
-        "completed": 0
+         "completed": 0
     }
+
 }}
 {{=<% %>=}}
 <%#extradata%>
-<ion-item class="mod_questionnaire_slider">
-    <ion-range <%#completed%> disabled="true"<%/completed%>
-            min="<%extradata.minrange%>" max="<%extradata.maxrange%>"
-            pin="true" step="<%extradata.stepvalue%>"
-            [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
-        <ion-label range-left><%extradata.leftlabel%></ion-label>
-        <ion-label range-right><%extradata.rightlabel%></ion-label>
+<ion-item class="mod_questionnaire_slider" lines="none">
+    <ion-range
+    <%#completed%> disabled="true"<%/completed%>
+    min="<%extradata.minrange%>" max="<%extradata.maxrange%>"
+    pin="true" step="<%extradata.stepvalue%>"
+    [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
+    <ion-label slot="start"><%extradata.leftlabel%></ion-label>
+    <ion-label slot="end"><%extradata.rightlabel%></ion-label>
     </ion-range>
 </ion-item>
-<ion-label text-center><%extradata.centerlabel%></ion-label>
+<ion-label <%#completed%> class="disabled"<%/completed%>>
+    <core-format-text class="ion-text-center" text="<%extradata.centerlabel%>"></core-format-text>
+</ion-label>
 <%/extradata%>
diff --git a/templates/local/mobile/ionic3/text_question.mustache b/templates/local/mobile/ionic5/text_question.mustache
similarity index 88%
rename from templates/local/mobile/ionic3/text_question.mustache
rename to templates/local/mobile/ionic5/text_question.mustache
index c737a465..8113aea9 100644
--- a/templates/local/mobile/ionic3/text_question.mustache
+++ b/templates/local/mobile/ionic5/text_question.mustache
@@ -31,11 +31,13 @@
 }}
 {{=<% %>=}}
 <ion-item>
+    <ion-label>
+        <%#completed%>
+        <core-format-text text="{{ CONTENT_OTHERDATA.<%fieldkey%> }}"></core-format-text>
+        <%/completed%>
+    </ion-label>
     <%^completed%>
     <ion-textarea aria-multiline="true" [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>"
                   core-auto-rows></ion-textarea>
     <%/completed%>
-    <%#completed%>
-    <ion-note><core-format-text text="{{ CONTENT_OTHERDATA.<%fieldkey%> }}"></core-format-text></ion-note>
-    <%/completed%>
 </ion-item>
\ No newline at end of file
diff --git a/templates/local/mobile/ionic3/view_activity_page.mustache b/templates/local/mobile/ionic5/view_activity_page.mustache
similarity index 55%
rename from templates/local/mobile/ionic3/view_activity_page.mustache
rename to templates/local/mobile/ionic5/view_activity_page.mustache
index 62e9ae53..ee5f508b 100644
--- a/templates/local/mobile/ionic3/view_activity_page.mustache
+++ b/templates/local/mobile/ionic5/view_activity_page.mustache
@@ -41,6 +41,7 @@
         "pagenum": 0,
         "nextpage": 1,
         "prevpage": 0,
+        "hasmorepages": 1,
         "completed": "1",
         "complete_userdate": "Monday, 17 December 2018, 3:34pm",
         "emptypage": "0",
@@ -92,78 +93,103 @@
         <ion-card>
             <ion-list>
                 <%#pagequestions%>
-                <ion-list-header text-wrap>
-                    <%#autonumquestions%><ion-badge color="dark" item-start><%qnum%></ion-badge><%/autonumquestions%>
-                    <core-format-text text="<%content%>"></core-format-text>
-                    <%#required%><ion-badge item-end color="danger">{{ 'plugin.mod_questionnaire.required' | translate }}</ion-badge><%/required%>
-                </ion-list-header>
+                <ion-item class="ion-text-wrap">
+                    <%#autonumquestions%><ion-badge color="dark" slot="start"><%qnum%></ion-badge><%/autonumquestions%>
+                    <ion-label>
+                        <core-format-text text="<%content%>"></core-format-text>
+                    </ion-label>
+                    <%#required%><ion-badge slot="end" color="danger">{{ 'plugin.mod_questionnaire.required' | translate }}</ion-badge><%/required%>
+                </ion-item>
                 <%#isselect%>
-                    <%> mod_questionnaire/local/mobile/ionic3/select_question %>
+                    <%> mod_questionnaire/local/mobile/ionic5/select_question %>
                 <%/isselect%>
                 <%#isbool%>
-                    <%> mod_questionnaire/local/mobile/ionic3/boolean_question %>
+                    <%> mod_questionnaire/local/mobile/ionic5/boolean_question %>
                 <%/isbool%>
                 <%#isradiobutton%>
-                    <%> mod_questionnaire/local/mobile/ionic3/radio_question %>
+                    <%> mod_questionnaire/local/mobile/ionic5/radio_question %>
                 <%/isradiobutton%>
                 <%#ischeckbox%>
-                    <%> mod_questionnaire/local/mobile/ionic3/checkbox_question %>
+                    <%> mod_questionnaire/local/mobile/ionic5/checkbox_question %>
                 <%/ischeckbox%>
                 <%#istextessay%>
-                    <%> mod_questionnaire/local/mobile/ionic3/text_question %>
+                    <%> mod_questionnaire/local/mobile/ionic5/text_question %>
                 <%/istextessay%>
                 <%#isnumeric%>
-                    <%> mod_questionnaire/local/mobile/ionic3/numeric_question %>
+                    <%> mod_questionnaire/local/mobile/ionic5/numeric_question %>
                 <%/isnumeric%>
                 <%#isdate%>
-                    <%> mod_questionnaire/local/mobile/ionic3/date_question %>
+                    <%> mod_questionnaire/local/mobile/ionic5/date_question %>
                 <%/isdate%>
                 <%#israte%>
-                    <%> mod_questionnaire/local/mobile/ionic3/rate_question %>
+                    <%> mod_questionnaire/local/mobile/ionic5/rate_question %>
                 <%/israte%>
                 <%#isslider%>
-                    <%> mod_questionnaire/local/mobile/ionic3/slider_question %>
+                <%> mod_questionnaire/local/mobile/ionic5/slider_question %>
                 <%/isslider%>
                 <%/pagequestions%>
 
                 <%^pagequestions%>
-                <p>No questions found.</p>
+                <ion-item>
+                    <ion-label>
+                        <p>No questions found.</p>
+                    </ion-label>
+                </ion-item>
                 <%/pagequestions%>
 
-                <%#prevpage%>
-                <button ion-button item-end outline icon-start block core-site-plugins-new-content component="mod_questionnaire" method="mobile_view_activity"
-                        [args]="{
-                                        cmid: <%cmid%>,
-                                        rid: <%rid%>,
-                                        completeq: 1,
-                                        action: 'previouspage',
-                                        pagenum: <%pagenum%>
-                                    }"
-                        [useOtherData]="null"
-                        [preSets]="{getFromCache: 0, saveToCache: 0}"
-                        refreshOnSuccess="true"
-                        samePage="true" type="submit"
-                ><ion-icon name="arrow-back"></ion-icon> {{ 'plugin.mod_questionnaire.previouspage' | translate }}</button>
-                <%/prevpage%>
+                <%#hasmorepages%>
+                <ion-grid class="ion-text-wrap">
+                    <ion-row>
+                        <%#prevpage%>
+                        <ion-col>
+                            <ion-button expand="block" fill="outline" core-site-plugins-new-content component="mod_questionnaire"
+                                method="mobile_view_activity"
+                                [args]="{
+                                                cmid: <%cmid%>,
+                                                rid: <%rid%>,
+                                                completeq: 1,
+                                                action: 'previouspage',
+                                                pagenum: <%pagenum%>
+                                            }"
+                                [useOtherData]="null"
+                                [preSets]="{getFromCache: 0, saveToCache: 0}"
+                                refreshOnSuccess="true"
+                                samePage="true" type="submit"
+                            >
+                                <ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>
+                                {{ 'plugin.mod_questionnaire.previouspage' | translate }}
+                            </ion-button>
+                        </ion-col>
+                        <%/prevpage%>
 
-                <%#nextpage%>
-                <button ion-button item-end outline icon-end block core-site-plugins-new-content component="mod_questionnaire" method="mobile_view_activity"
-                        [args]="{
-                                    cmid: <%cmid%>,
-                                    rid: <%rid%>,
-                                    completeq: 1,
-                                    action: 'nextpage',
-                                    pagenum: <%pagenum%>
-                                }"
-                        [useOtherData]="null"
-                        [preSets]="{getFromCache: 0, saveToCache: 0}"
-                        refreshOnSuccess="true"
-                        samePage="true" type="submit"
-                >{{ 'plugin.mod_questionnaire.nextpage' | translate }} <ion-icon name="arrow-forward"></ion-icon></button>
-                <%/nextpage%>
+                        <%#nextpage%>
+                        <ion-col>
+                            <ion-button expand="block" fill="outline" core-site-plugins-new-content component="mod_questionnaire"
+                                method="mobile_view_activity"
+                                [args]="{
+                                                cmid: <%cmid%>,
+                                                rid: <%rid%>,
+                                                completeq: 1,
+                                                action: 'nextpage',
+                                                pagenum: <%pagenum%>
+                                            }"
+                                [useOtherData]="null"
+                                [preSets]="{getFromCache: 0, saveToCache: 0}"
+                                refreshOnSuccess="true"
+                                samePage="true" type="submit"
+                            >
+                                <ion-icon name="fas-chevron-right" slot="end" aria-hidden="true"></ion-icon>
+                                {{ 'plugin.mod_questionnaire.nextpage' | translate }}
+                            </ion-button>
+                        </ion-col>
+                        <%/nextpage%>
+                    </ion-row>
+                </ion-grid>
+                <%/hasmorepages%>
 
                 <%^nextpage%><%^completed%>
-                <button ion-button block core-site-plugins-new-content component="mod_questionnaire" method="mobile_view_activity"
+                <ion-button expand="block" class="ion-margin" core-site-plugins-new-content component="mod_questionnaire"
+                        method="mobile_view_activity"
                         [args]="{
                                     questionnaireid: <%id%>,
                                     surveyid: <%surveyid%>,
@@ -179,11 +205,11 @@
                         [preSets]="{getFromCache: 0, saveToCache: 0}"
                         refreshOnSuccess="true"
                         samePage="true" type="submit"
-                >{{ 'plugin.mod_questionnaire.savechanges' | translate }}</button>
+                >{{ 'plugin.mod_questionnaire.savechanges' | translate }}</ion-button>
                 <%/completed%><%/nextpage%>
             </ion-list>
         </ion-card>
     </div>
     <%#emptypage%>
     <%/emptypage%>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/local/mobile/latest/boolean_question.mustache b/templates/local/mobile/latest/boolean_question.mustache
index 1d5958dd..bde7cd49 100644
--- a/templates/local/mobile/latest/boolean_question.mustache
+++ b/templates/local/mobile/latest/boolean_question.mustache
@@ -46,8 +46,9 @@
 <ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
     <%#choices%>
     <ion-item class="ion-text-wrap">
-        <ion-label><core-format-text text="<%content%>"></core-format-text></ion-label>
-        <ion-radio slot="end"<%#completed%> disabled="true"<%#value%> checked="true"<%/value%><%/completed%> [value]="<%id%>"></ion-radio>
+        <ion-radio slot="end"<%#completed%> disabled="true"<%#value%> checked="true"<%/value%><%/completed%> [value]="<%id%>">
+            <core-format-text text="<%content%>"></core-format-text>
+        </ion-radio>
     </ion-item>
     <%/choices%>
-</ion-radio-group>
\ No newline at end of file
+</ion-radio-group>
diff --git a/templates/local/mobile/latest/checkbox_question.mustache b/templates/local/mobile/latest/checkbox_question.mustache
index 0a769fbd..86640f76 100644
--- a/templates/local/mobile/latest/checkbox_question.mustache
+++ b/templates/local/mobile/latest/checkbox_question.mustache
@@ -46,11 +46,12 @@
 {{=<% %>=}}
 <ion-list>
     <%#choices%>
-        <ion-item>
-            <ion-label><core-format-text text="<%content%>"></core-format-text></ion-label>
+        <ion-item class="ion-text-wrap">
             <ion-checkbox <%#value%> checked="true"<%/value%> value="<%id%>"
             <%#completed%> disabled="true"<%/completed%>
-            [(ngModel)]="CONTENT_OTHERDATA.<%choicefieldkey%>"></ion-checkbox>
+            [(ngModel)]="CONTENT_OTHERDATA.<%choicefieldkey%>">
+                <core-format-text text="<%content%>"></core-format-text>
+            </ion-checkbox>
         </ion-item>
         <%#otherchoicekey%>
             <ion-item>
@@ -59,4 +60,4 @@
             </ion-item>
         <%/otherchoicekey%>
     <%/choices%>
-</ion-list>
\ No newline at end of file
+</ion-list>
diff --git a/templates/local/mobile/latest/date_question.mustache b/templates/local/mobile/latest/date_question.mustache
index 460c17f5..1554a6ed 100644
--- a/templates/local/mobile/latest/date_question.mustache
+++ b/templates/local/mobile/latest/date_question.mustache
@@ -37,6 +37,14 @@
         <%/completed%>
     </ion-label>
     <%^completed%>
-    <ion-datetime displayFormat="DD/MM/YYYY" max="2100-12-31" [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>"></ion-datetime>
+    <ion-datetime-button datetime="questionnaire-date-<%fieldkey%>" />
+    <ion-modal [keepContentsMounted]="true">
+        <ng-template>
+            <ion-datetime id="questionnaire-date-<%fieldkey%>" [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>" presentation="date-time"
+                max="2100-12-31" [showDefaultButtons]="true">
+                <span slot="title">{{'core.date' | translate}}</span>
+            </ion-datetime>
+        </ng-template>
+    </ion-modal>
     <%/completed%>
 </ion-item>
diff --git a/templates/local/mobile/latest/main_index_page.mustache b/templates/local/mobile/latest/main_index_page.mustache
index 249b951e..b561bc1a 100644
--- a/templates/local/mobile/latest/main_index_page.mustache
+++ b/templates/local/mobile/latest/main_index_page.mustache
@@ -78,9 +78,8 @@
 }}
 {{=<% %>=}}
 <div>
-    <core-course-module-description description="<%intro%>"
-                                    component="mod_questionnaire" componentId="<%cmid%>"
-                                    pagenum="<%pagenum%>"></core-course-module-description>
+    <core-course-module-info [module]="module" description="<%intro%>" component="mod_questionnaire" componentId="<%cmid%>"
+        [courseId]="courseId"></core-course-module-info>
     <%#notifications%>
     <ion-card>
         <ion-card-content>
@@ -122,4 +121,4 @@
     <%/submissions.0%>
     <%#emptypage%>
     <%/emptypage%>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/local/mobile/latest/radio_question.mustache b/templates/local/mobile/latest/radio_question.mustache
index 3d57c2f7..ccffab0b 100644
--- a/templates/local/mobile/latest/radio_question.mustache
+++ b/templates/local/mobile/latest/radio_question.mustache
@@ -46,10 +46,11 @@
 <ion-radio-group [(ngModel)]="CONTENT_OTHERDATA.<%fieldkey%>">
     <%#choices%>
         <ion-item class="ion-text-wrap">
-            <ion-label><core-format-text text="<%content%>"></core-format-text></ion-label>
             <ion-radio<%#value%> checked="true"<%/value%>
             value="<%id%>"
-            <%#completed%> disabled="true"<%/completed%>></ion-radio>
+            <%#completed%> disabled="true"<%/completed%>>
+                <core-format-text text="<%content%>"></core-format-text>
+            </ion-radio>
         </ion-item>
         <%#otherchoicekey%>
             <ion-item class="ion-text-wrap">
@@ -58,4 +59,4 @@
             </ion-item>
         <%/otherchoicekey%>
     <%/choices%>
-</ion-radio-group>
\ No newline at end of file
+</ion-radio-group>
diff --git a/templates/local/mobile/latest/slider_question.mustache b/templates/local/mobile/latest/slider_question.mustache
index 80623356..318dce0b 100644
--- a/templates/local/mobile/latest/slider_question.mustache
+++ b/templates/local/mobile/latest/slider_question.mustache
@@ -51,7 +51,9 @@
     <ion-label slot="end"><%extradata.rightlabel%></ion-label>
     </ion-range>
 </ion-item>
-<ion-label <%#completed%> class="disabled"<%/completed%>>
-    <core-format-text class="ion-text-center" text="<%extradata.centerlabel%>"></core-format-text>
-</ion-label>
+<ion-item class="ion-text-wrap text-center">
+    <ion-label <%#completed%> class="disabled"<%/completed%>>
+        <core-format-text class="ion-text-center" text="<%extradata.centerlabel%>"></core-format-text>
+    </ion-label>
+</ion-item>
 <%/extradata%>
diff --git a/templates/local/mobile/latest/view_activity_page.mustache b/templates/local/mobile/latest/view_activity_page.mustache
index 54a1bae8..eb7a8a47 100644
--- a/templates/local/mobile/latest/view_activity_page.mustache
+++ b/templates/local/mobile/latest/view_activity_page.mustache
@@ -79,9 +79,15 @@
 }}
 {{=<% %>=}}
 <div>
-    <core-course-module-description description="<%intro%>"
-                                    component="mod_questionnaire" componentId="<%cmid%>"
-                                    pagenum="<%pagenum%>"></core-course-module-description>
+    <%#intro%>
+    <ion-card>
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <core-format-text text="<%intro%>" component="mod_questionnaire" componentId="<%cmid%>" collapsible-item />
+            </ion-label>
+        </ion-item>
+    </ion-card>
+    <%/intro%>
     <%#notifications%>
     <ion-card>
         <ion-card-content>
@@ -212,4 +218,4 @@
     </div>
     <%#emptypage%>
     <%/emptypage%>
-</div>
\ No newline at end of file
+</div>