diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ab3f526..45a0827 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -198,6 +198,7 @@ jobs:
         env:
           DB: ${{ matrix.database }}
           MOODLE_BRANCH: ${{ matrix.moodle-branch }}
+          MUSTACHE_IGNORE_NAMES: 'mobile_*.mustache'
 
       - name: PHP Lint
         if: ${{ always() }}
diff --git a/classes/external/save_feedback.php b/classes/external/save_feedback.php
index 3c21304..4cc052c 100644
--- a/classes/external/save_feedback.php
+++ b/classes/external/save_feedback.php
@@ -52,15 +52,12 @@ class_alias('external_api', 'mod_journal\external\journal_external_api_base');
  * @copyright 2026 Adrian Sarmas adrian.emanuel.sarmas@gmail.com
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class save_feedback extends journal_external_api_base
-{
-
+class save_feedback extends journal_external_api_base {
     /**
      * Parameters.
      * @return external_function_parameters
      */
-    public static function execute_parameters(): external_function_parameters
-    {
+    public static function execute_parameters(): external_function_parameters {
         return new external_function_parameters([
             'cmid' => new external_value(PARAM_INT, 'Course module id'),
             'entryid' => new external_value(PARAM_INT, 'Journal entry id'),
@@ -71,8 +68,33 @@ public static function execute_parameters(): external_function_parameters
         ]);
     }
 
-    public static function execute(int $cmid, int $entryid, int $userid, int $grade, string $feedback = '', int $itemid = 0): array
-    {
+    /**
+     * Execute.
+     *
+     * @param int $cmid
+     * @param int $entryid
+     * @param int $userid
+     * @param int $grade
+     * @param string $feedback
+     * @param int $itemid
+     * @return array
+     * @throws \coding_exception
+     * @throws \core_external\restricted_context_exception
+     * @throws \dml_exception
+     * @throws \dml_transaction_exception
+     * @throws \moodle_exception
+     * @throws \require_login_exception
+     * @throws \required_capability_exception
+     * @throws invalid_parameter_exception
+     */
+    public static function execute(
+        int $cmid,
+        int $entryid,
+        int $userid,
+        int $grade,
+        string $feedback = '',
+        int $itemid = 0
+    ): array {
         global $DB, $USER;
 
         $params = self::validate_parameters(self::execute_parameters(), [
@@ -160,8 +182,12 @@ public static function execute(int $cmid, int $entryid, int $userid, int $grade,
         ];
     }
 
-    public static function execute_returns(): external_single_structure
-    {
+    /**
+     * Return structure.
+     *
+     * @return external_single_structure
+     */
+    public static function execute_returns(): external_single_structure {
         return new external_single_structure([
             'status' => new external_value(PARAM_ALPHA, 'ok'),
             'changed' => new external_value(PARAM_INT, '1 if something changed, else 0'),
diff --git a/classes/external/set_text.php b/classes/external/set_text.php
index 8e22427..29123e8 100644
--- a/classes/external/set_text.php
+++ b/classes/external/set_text.php
@@ -101,6 +101,7 @@ public static function execute_returns(): external_single_structure {
      * @param int $journalid Journal course module ID
      * @param string $text Text parameter
      * @param int|string $format Format constant for the string
+     * @param int $itemid Item id for draft area (files)
      * @return array
      */
     public static function execute(int $journalid, string $text, $format, int $itemid = 0) {
@@ -111,7 +112,7 @@ public static function execute(int $journalid, string $text, $format, int $itemi
             ['journalid' => $journalid, 'text' => $text, 'format' => $format, 'itemid' => $itemid]
         );
 
-        if (!$cm = get_coursemodule_from_instance('journal', $params['journalid'])) {
+        if (!$cm = get_coursemodule_from_id('journal', $params['journalid'])) {
             throw new invalid_parameter_exception(get_string('incorrectcmid', 'journal'));
         }
 
@@ -142,9 +143,9 @@ public static function execute(int $journalid, string $text, $format, int $itemi
         } else {
             // Create a record first to get an ID for file storage.
             $tempentry = clone $newentry;
-            $tempentry->text = ''; 
+            $tempentry->text = '';
             $newentry->id = $DB->insert_record('journal_entries', $tempentry);
-            $entry = $newentry; 
+            $entry = $newentry;
         }
 
         // Handle File Drafts.
@@ -186,10 +187,10 @@ public static function execute(int $journalid, string $text, $format, int $itemi
             $completion->update_state($cm, COMPLETION_COMPLETE);
         }
 
-        // Return array matching execute_returns
+        // Return array matching execute_returns.
         return [
             'status' => 'ok',
-            'text' => $newentry->text
+            'text' => $newentry->text,
         ];
     }
 }
diff --git a/classes/external/view_journal.php b/classes/external/view_journal.php
index 16b42c2..ea53f29 100644
--- a/classes/external/view_journal.php
+++ b/classes/external/view_journal.php
@@ -25,7 +25,7 @@
 
 global $CFG;
 
-// Dynamic Class Logic
+// Dynamic Class Logic.
 if (!class_exists('mod_journal\external\journal_external_api_base')) {
     if (class_exists('core_external\external_api')) {
         class_alias('core_external\external_api', 'mod_journal\external\journal_external_api_base');
@@ -49,7 +49,6 @@ class_alias('external_api', 'mod_journal\external\journal_external_api_base');
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_journal extends journal_external_api_base {
-
     /**
      * Parameters.
      * @return external_function_parameters
@@ -100,4 +99,4 @@ public static function execute($journalid) {
     public static function execute_returns() {
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/classes/output/mobile.php b/classes/output/mobile.php
index de789d0..fc6a956 100644
--- a/classes/output/mobile.php
+++ b/classes/output/mobile.php
@@ -33,7 +33,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class mobile {
-
     /**
      * Returns the template and data for the main course view in the mobile app.
      *
@@ -77,13 +76,13 @@ public static function mobile_course_view($args) {
         $canadd = has_capability('mod/journal:addentries', $context);
         $canmanage = has_capability('mod/journal:manageentries', $context);
 
-        // --- TEACHER VIEW LOGIC ---
+        // TEACHER VIEW LOGIC.
         if ($canmanage) {
             $data['isteacher'] = true;
 
             // Determine grouping.
             $currentgroup = groups_get_activity_group($cm, true);
-            
+
             // Get list of users who have submitted entries.
             $users = journal_get_users_done($journal, $currentgroup);
             $submissions = [];
@@ -155,7 +154,7 @@ public static function mobile_course_view($args) {
             $data['submissions'] = $submissions;
         }
 
-        // --- STUDENT VIEW LOGIC ---
+        // STUDENT VIEW LOGIC.
         // Calculate open/close dates.
         $timenow = time();
         $timestart = 0;
@@ -189,7 +188,7 @@ public static function mobile_course_view($args) {
         if ($entry) {
             $data['hasentry'] = true;
             $data['lastedited'] = userdate($entry->modified);
-            
+
             // Rewrite files for display.
             $text = file_rewrite_pluginfile_urls(
                 (string) $entry->text,
@@ -204,7 +203,7 @@ public static function mobile_course_view($args) {
             // Check for feedback.
             if (!empty($entry->entrycomment) || (!empty($entry->rating) && $entry->rating != -1)) {
                 $data['hasfeedback'] = true;
-                
+
                 $feedbacktext = file_rewrite_pluginfile_urls(
                     (string) $entry->entrycomment,
                     'pluginfile.php',
@@ -262,7 +261,7 @@ public static function mobile_course_view($args) {
 
     /**
      * Student entry editor page.
-     * 
+     *
      * This page is opened via core-site-plugins-new-content from the main view.
      * It provides a simple textarea for the student to write their entry.
      *
diff --git a/db/mobile.php b/db/mobile.php
index 4b886fb..7bd71b9 100644
--- a/db/mobile.php
+++ b/db/mobile.php
@@ -55,10 +55,10 @@
             ['entries', 'mod_journal'],
             ['noentriesmanagers', 'mod_journal'],
             ['entry', 'mod_journal'],
-            ['gradedby', 'moodle'],
+            ['gradedby', 'mod_journal'],
             ['nograde', 'mod_journal'],
             ['changessaved', 'mod_journal'],
         ],
         'css' => $CFG->wwwroot . '/mod/journal/styles.css',
     ],
-];
\ No newline at end of file
+];
diff --git a/db/services.php b/db/services.php
index 2f794b4..232ea0a 100644
--- a/db/services.php
+++ b/db/services.php
@@ -57,4 +57,4 @@
         'ajax'        => true,
         'services'    => [MOODLE_OFFICIAL_MOBILE_SERVICE],
     ],
-];
\ No newline at end of file
+];
diff --git a/lang/en/journal.php b/lang/en/journal.php
index e376ef3..a9c7e2b 100755
--- a/lang/en/journal.php
+++ b/lang/en/journal.php
@@ -28,6 +28,7 @@
 $string['accessdenied'] = 'Access denied';
 $string['alwaysopen'] = 'Always open';
 $string['blankentry'] = 'Blank entry';
+$string['changessaved'] = 'Changes saved';
 $string['completiondetail:completion_create_entry'] = 'Create a journal entry';
 $string['couldnotupdatejournal'] = 'Could not update your journal';
 $string['countnotinsertjournalentry'] = 'Could not insert a new journal entry';
@@ -52,10 +53,13 @@
 $string['eventjournaldeleted'] = 'Journal deleted';
 $string['eventjournalviewed'] = 'Journal viewed';
 $string['failedupdate'] = 'Failed to update the journal feedback for {$a}';
+$string['feedback'] = 'Feedback';
 $string['feedbackupdated'] = 'Feedback updated for {$a} entries';
 $string['feedbackupdatedforuser'] = 'Feedback updated for {$a}';
 $string['firstnameasc'] = 'Firstname Ascending';
 $string['firstnamedesc'] = 'Firstname Descending';
+$string['grade'] = 'Grade';
+$string['gradedby'] = 'Graded by';
 $string['gradeingradebook'] = 'Current grade in gradebook';
 $string['incorrectcmid'] = 'Course module ID is incorrect';
 $string['incorrectcourseid'] = 'Course ID is incorrect';
@@ -66,11 +70,6 @@
 $string['journal:addentries'] = 'Add journal entries';
 $string['journal:addinstance'] = 'Add a new journal';
 $string['journal:manageentries'] = 'Manage journal entries';
-$string['grade'] = 'Grade';
-$string['feedback'] = 'Feedback';
-$string['savechanges'] = 'Save changes'; 
-$string['nograde'] = 'No grade';
-$string['changessaved'] = 'Changes saved';
 
 // Updated Plain Text Template.
 $string['journalmail'] = 'Hi {$a->student},
@@ -128,6 +127,7 @@
 $string['nodeadline'] = 'Always open';
 $string['noentriesmanagers'] = 'There are no teachers';
 $string['noentry'] = 'No entry';
+$string['nograde'] = 'No grade';
 $string['noratinggiven'] = 'No rating given';
 $string['notifystudents'] = 'Notify students';
 $string['notifystudents_default'] = 'Notify students by default';
@@ -154,6 +154,7 @@
 $string['removeentries'] = 'Remove all entries';
 $string['removemessages'] = 'Remove all Journal entries';
 $string['saveallfeedback'] = 'Save all my feedback';
+$string['savechanges'] = 'Save changes';
 $string['savefeedback'] = 'Save feedback';
 $string['search:activity'] = 'Journal - activity information';
 $string['search:entry'] = 'Journal - entries';
diff --git a/lib.php b/lib.php
index ddcc8bd..4a422e8 100644
--- a/lib.php
+++ b/lib.php
@@ -1095,7 +1095,8 @@ function journal_print_user_entry($course, $user, $entry, $teachers, $grades, $c
             $options,
             $fpoptions
         );
-        echo "<p><div>".get_string('feedback', 'journal').":</div><textarea id=\"c$entry->id[text]\" name=\"c$entry->id[text]\" rows=\"7\" $feedbackdisabledstr>";
+        echo "<p><div>" . get_string('feedback', 'journal') .
+            ":</div><textarea id=\"c$entry->id[text]\" name=\"c$entry->id[text]\" rows=\"7\" $feedbackdisabledstr>";
         p($feedbacktext);
         echo '</textarea></p>';
 
diff --git a/templates/mobile_edit_entry.mustache b/templates/mobile_edit_entry.mustache
index 6ca1acf..b4dfd83 100644
--- a/templates/mobile_edit_entry.mustache
+++ b/templates/mobile_edit_entry.mustache
@@ -1,3 +1,90 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template mod_journal/mobile_edit_entry
+
+    This template will render the entry editing page in mobile view.
+
+    Variables required for this template:
+      * cmid: Course module ID, used to build the form id and links.
+      * name: Activity name shown in the card title.
+      * text_plain: Prefill text for the textarea.
+      * canedit: Boolean; controls whether the editing form is displayed.
+      * journalid: Sent as a hidden field in the form.
+      * format: Sent as a hidden field in the form.
+
+    Variables optional for this template:
+      * warning: Message displayed as a warning notice at the top.
+      * info: Additional information line below the title.
+      * hasentry, hasfeedback: Booleans for display/logic.
+      * userid, id, entryid, studentid, courseid
+      * studentpic, studentname, teacherpic, teachername
+      * feedback_plain, feedbacktext, feedbackdate, grade
+      * timemodified, attempt, rawscore, maxscore, duration
+      * completionicon, successicon, reporturl, intro
+      * submissions: Array of submission objects (see example JSON in the template).
+
+    Example context (json):
+    {
+      "id": 123,
+      "cmid": 456,
+      "userid": 789,
+      "timemodified": "2026-01-17 12:34",
+      "attempt": 1,
+      "rawscore": 8.5,
+      "maxscore": 10,
+      "duration": "2 minutes 10 seconds",
+      "completionicon": "<core-icon name=\\\"checkmark-circle\\\"></core-icon>",
+      "successicon": "<core-icon name=\\\"thumbs-up\\\"></core-icon>",
+      "reporturl": "https://example.com/report",
+      "name": "Journal activity example",
+      "intro": "<p>Journal description.</p>",
+      "hasentry": true,
+      "hasfeedback": true,
+      "canedit": true,
+      "studentpic": "<img src=\"pic.jpg\"/>",
+      "studentname": "Student One",
+      "studentid": 789,
+      "entryid": 111,
+      "text_plain": "<p>Entry text by the student.</p>",
+      "feedback_plain": "Well done.",
+      "teacherpic": "<img src=\"teacher.jpg\"/>",
+      "teachername": "Teacher One",
+      "feedbackdate": "2026-01-16",
+      "grade": "8.5",
+      "feedbacktext": "<p>Positive feedback</p>",
+      "courseid": 42,
+      "submissions": [
+        {
+          "studentpic": "<img src=\"pic.jpg\"/>",
+          "studentname": "Student One",
+          "timemodified": "2026-01-17 12:00",
+          "text": "<p>Entry</p>",
+          "entryid": 111,
+          "studentid": 789,
+          "rating_minus_one": "",
+          "gradeoptions": [
+            { "val": 0, "label": "0" },
+            { "val": 10, "label": "10", "selected": "selected" }
+          ]
+        }
+      ]
+    }
+}}
 <div class="ion-padding">
     {{#warning}}
         <core-alert message="{{warning}}" type="warning"></core-alert>
@@ -16,13 +103,13 @@
             {{/canedit}}
 
             {{#canedit}}
-                <!-- 
+                <!--
                     FORM CONTAINER
                     Using <form ngNoForm> creates a standard HTML form context.
                     This allows the directive to find the textarea easily.
                 -->
                 <form id="journal-entry-form-{{cmid}}" ngNoForm>
-                    
+
                     <!-- Textarea wrapped in a plain div -->
                     <div style="margin-bottom: 15px;">
                     <textarea
@@ -38,9 +125,9 @@
                 </form>
 
                 <div class="ion-margin-top">
-                   
 
-                    <!-- 
+
+                    <!--
                         SAVE BUTTON
                         1. core-site-plugins-call-ws on the ion-button.
                         2. form="journal-entry-form-{{cmid}}" links to the form ID above.
diff --git a/templates/mobile_view.mustache b/templates/mobile_view.mustache
index fc70fa9..1f48deb 100644
--- a/templates/mobile_view.mustache
+++ b/templates/mobile_view.mustache
@@ -1,3 +1,96 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template mod_journal/mobile_view
+
+    This template will render the mobile view.
+
+    Variables required for this template:
+    * id - Journal entry record id
+    * cmid - Course module id (used for component-id and links)
+    * userid - Owner user id
+    * timemodified - Time the entry was last modified (formatted)
+    * attempt - Attempt number
+    * rawscore - Numeric raw score
+    * maxscore - Maximum possible score
+    * duration - Duration text (e.g. "2 minutes 10 seconds")
+    * completionicon - HTML for completion icon
+    * successicon - HTML for success icon
+    * reporturl - URL/object for report links
+    * name - Activity name
+    * intro - Activity introduction (HTML)
+
+    Variables optional for this template:
+    * user - Optional user object (student)
+    * submissions - Array of submission objects (teacher view)
+    * studentpic / studentname / studentid / entryid - per-submission fields
+    * gradeoptions / rating_minus_one / selected / label - grading select data
+    * feedback_plain / feedbacktext - teacher feedback fields
+    * teacherpic / teachername / feedbackdate - feedback author info
+    * hasentry / hasfeedback / canedit / info - control flags and messages
+    * courseid - Course id for navigation
+
+    Example context (json):
+    {
+      "id": 123,
+      "cmid": 456,
+      "userid": 789,
+      "timemodified": "2026-01-17 12:34",
+      "attempt": 1,
+      "rawscore": 8.5,
+      "maxscore": 10,
+      "duration": "2 minutes 10 seconds",
+      "completionicon": "<core-icon name=\"checkmark-circle\"></core-icon>",
+      "successicon": "<core-icon name=\"thumbs-up\"></core-icon>",
+      "reporturl": "https://example.com/report",
+      "name": "Journal activity example",
+      "intro": "<p>Journal description.</p>",
+      "hasentry": true,
+      "hasfeedback": true,
+      "canedit": true,
+      "studentpic": "<img src=\"pic.jpg\"/>",
+      "studentname": "Student One",
+      "studentid": 789,
+      "entryid": 111,
+      "text": "<p>Entry text by the student.</p>",
+      "feedback_plain": "Well done.",
+      "teacherpic": "<img src=\"teacher.jpg\"/>",
+      "teachername": "Teacher One",
+      "feedbackdate": "2026-01-16",
+      "grade": "8.5",
+      "feedbacktext": "<p>Positive feedback</p>",
+      "courseid": 42,
+      "submissions": [
+        {
+          "studentpic": "<img src=\"pic.jpg\"/>",
+          "studentname": "Student One",
+          "timemodified": "2026-01-17 12:00",
+          "text": "<p>Entry</p>",
+          "entryid": 111,
+          "studentid": 789,
+          "rating_minus_one": "",
+          "gradeoptions": [
+            { "val": 0, "label": "0" },
+            { "val": 10, "label": "10", "selected": "selected" }
+          ]
+        }
+      ]
+    }
+}}
 <div class="ion-padding">
     {{#warning}}
         <core-alert message="{{warning}}" type="warning"></core-alert>
@@ -42,9 +135,9 @@
 
                 <div class="ion-padding">
 
-                    <!-- 
+                    <!--
                          GRADING FORM CONTAINER
-                         Using <form ngNoForm> is crucial here. 
+                         Using <form ngNoForm> is crucial here.
                          It prevents Angular from throwing "Cannot find control" errors for the inputs inside.
                          It provides a clean DOM scope for the core-site-plugins-call-ws directive to scrape data.
                     -->
@@ -86,7 +179,7 @@
                     </form>
 
                     <div class="ion-margin-top">
-                        <!-- 
+                        <!--
                             SAVE BUTTON
                             The directive is placed directly on the ion-button.
                             form="journal-feedback-{{entryid}}" links this button to the form above.
@@ -159,7 +252,7 @@
                 <ion-card-content>
                     {{#info}}<p><i>{{info}}</i></p>{{/info}}
 
-                    <!-- 
+                    <!--
                         NAVIGATE TO EDIT PAGE
                         We use core-site-plugins-new-content to push a new page onto the stack.
                         This calls 'mobile_entry_edit' in mobile.php.
diff --git a/tests/behat/overview_report.feature b/tests/behat/overview_report.feature
index 0f25e9f..dcddff6 100644
--- a/tests/behat/overview_report.feature
+++ b/tests/behat/overview_report.feature
@@ -4,7 +4,6 @@ Feature: Testing overview integration in journal activity
   As a user
   I need to be able to see the journal activity overview
 
-
   Background:
     Given the following "courses" exist:
       | fullname | shortname | category | groupmode |
diff --git a/tests/external/set_text_test.php b/tests/external/set_text_test.php
index 555c6fb..b1d5538 100644
--- a/tests/external/set_text_test.php
+++ b/tests/external/set_text_test.php
@@ -25,6 +25,8 @@
 /**
  * Unit tests for the class \mod_journal\external\set_text
  *
+ * @runTestsInSeparateProcesses
+ *
  * @package   mod_journal
  * @copyright 2025 eDaktik GmbH {@link https://www.edaktik.at/}
  * @author    Christian Abila <christian.abila@edaktik.at>
@@ -76,7 +78,7 @@ public function test_text_is_set_in_journal(): void {
 
         $result = set_text::execute($journal->cmid, 'newtext', FORMAT_PLAIN);
 
-        $this->assertEquals('newtext', $result);
+        $this->assertEquals('newtext', $result['text']);
 
         $result = $DB->get_record('journal_entries', ['journal' => $journal->id, 'userid' => $USER->id]);