diff --git a/app/assets/stylesheets/actiontext.css b/app/assets/stylesheets/actiontext.css
index b849676e..ae5522ab 100644
--- a/app/assets/stylesheets/actiontext.css
+++ b/app/assets/stylesheets/actiontext.css
@@ -40,6 +40,7 @@
   background-color: white !important;
 }
 
-.trix-content {
+.trix-content-editor {
   min-height: 10rem;
+  width: 100%;
 }
diff --git a/app/javascript/controllers/datetime_controller.js b/app/javascript/controllers/datetime_controller.js
index 04c9061b..b56f07e3 100644
--- a/app/javascript/controllers/datetime_controller.js
+++ b/app/javascript/controllers/datetime_controller.js
@@ -1,3 +1,7 @@
+// This controller is being used on:
+// - trips/new
+// - trips/edit
+
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
diff --git a/app/javascript/controllers/trips_controller.js b/app/javascript/controllers/trips_controller.js
index c40b1426..1d2e8c7e 100644
--- a/app/javascript/controllers/trips_controller.js
+++ b/app/javascript/controllers/trips_controller.js
@@ -1,3 +1,8 @@
+// This controller is being used on:
+// - trips/show
+// - trips/edit
+// - trips/new
+
 import { Controller } from "@hotwired/stimulus"
 import L from "leaflet"
 import {
@@ -192,7 +197,7 @@ export default class extends Controller {
     this.map.fitBounds(bounds, { padding: [50, 50] })
   }
 
-  // Add this new method to update coordinates and refresh the map
+  // Update coordinates and refresh the map
   updateMapWithCoordinates(newCoordinates) {
     // Transform the coordinates to match the expected format
     this.coordinates = newCoordinates.map(point => [
diff --git a/app/models/trip.rb b/app/models/trip.rb
index 00c2774a..4043e8c7 100644
--- a/app/models/trip.rb
+++ b/app/models/trip.rb
@@ -7,12 +7,13 @@ class Trip < ApplicationRecord
 
   validates :name, :started_at, :ended_at, presence: true
 
-  before_save :calculate_distance
+  before_save :create_path!
 
   def create_path!
-    self.path = Tracks::BuildPath.new(points.pluck(:latitude, :longitude)).call
+    trip_path = Tracks::BuildPath.new(points.pluck(:latitude, :longitude)).call
+    distance = calculate_distance
 
-    save!
+    update_columns(path: trip_path, distance: distance) # Avoids recursion with `after_save`
   end
 
   def points
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
index cf5518ff..40dc57e3 100644
--- a/app/views/trips/_form.html.erb
+++ b/app/views/trips/_form.html.erb
@@ -62,7 +62,7 @@
 
       <div class="form-control">
         <%= form.label :notes %>
-        <%= form.rich_text_area :notes %>
+        <%= form.rich_text_area :notes, class: 'trix-content-editor' %>
       </div>
 
       <div>