diff --git a/Gemfile.lock b/Gemfile.lock
index 150b23fc..b0434c1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,6 +18,7 @@ PATH
     mission_control-jobs (0.3.1)
       importmap-rails
       irb (~> 1.13)
+      propshaft
       rails (>= 7.1)
       stimulus-rails
       turbo-rails
@@ -177,6 +178,11 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
+    propshaft (0.8.0)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+      railties (>= 7.0.0)
     psych (5.1.2)
       stringio
     public_suffix (5.0.4)
diff --git a/app/assets/config/mission_control_jobs_manifest.js b/app/assets/config/mission_control_jobs_manifest.js
deleted file mode 100644
index 7ca72390..00000000
--- a/app/assets/config/mission_control_jobs_manifest.js
+++ /dev/null
@@ -1,4 +0,0 @@
-//= link_directory ../stylesheets/mission_control/jobs .css
-//= link_directory ../../javascript/mission_control/jobs .js
-//= link_directory ../../javascript/mission_control/jobs/controllers .js
-//= link_directory ../../javascript/mission_control/jobs/helpers .js
diff --git a/app/assets/stylesheets/mission_control/jobs/application.css b/app/assets/stylesheets/mission_control/jobs/application.css
index 3951e525..0f783bf7 100644
--- a/app/assets/stylesheets/mission_control/jobs/application.css
+++ b/app/assets/stylesheets/mission_control/jobs/application.css
@@ -1,16 +1,2 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */
-
+@import url("./forms.css");
+@import url("./jobs.css");
diff --git a/app/controllers/mission_control/jobs/application_controller.rb b/app/controllers/mission_control/jobs/application_controller.rb
index d9a81faf..1413bacb 100644
--- a/app/controllers/mission_control/jobs/application_controller.rb
+++ b/app/controllers/mission_control/jobs/application_controller.rb
@@ -1,6 +1,14 @@
 class MissionControl::Jobs::ApplicationController < MissionControl::Jobs.base_controller_class.constantize
+  ActionController::Base::MODULES.each do |mod|
+    include mod unless self < mod
+  end
+
   layout "mission_control/jobs/application"
 
+  # Include helpers if not already included
+  helper MissionControl::Jobs::ApplicationHelper unless self < MissionControl::Jobs::ApplicationHelper
+  helper Importmap::ImportmapTagsHelper unless self < Importmap::ImportmapTagsHelper
+
   include MissionControl::Jobs::ApplicationScoped, MissionControl::Jobs::NotFoundRedirections
   include MissionControl::Jobs::AdapterFeatures
 
diff --git a/lib/mission_control/jobs/engine.rb b/lib/mission_control/jobs/engine.rb
index e25f85cc..04a0b168 100644
--- a/lib/mission_control/jobs/engine.rb
+++ b/lib/mission_control/jobs/engine.rb
@@ -4,12 +4,15 @@
 require "importmap-rails"
 require "turbo-rails"
 require "stimulus-rails"
+require "propshaft"
 
 module MissionControl
   module Jobs
     class Engine < ::Rails::Engine
       isolate_namespace MissionControl::Jobs
 
+      config.middleware.use ActionDispatch::Flash unless config.action_dispatch.flash
+
       config.mission_control = ActiveSupport::OrderedOptions.new unless config.try(:mission_control)
       config.mission_control.jobs = ActiveSupport::OrderedOptions.new
 
@@ -87,6 +90,7 @@ class Engine < ::Rails::Engine
       end
 
       initializer "mission_control-jobs.assets" do |app|
+        app.config.assets.paths << root.join("app/assets/stylesheets")
         app.config.assets.paths << root.join("app/javascript")
         app.config.assets.precompile += %w[ mission_control_jobs_manifest ]
       end
diff --git a/mission_control-jobs.gemspec b/mission_control-jobs.gemspec
index fe5c7dfe..1611e53b 100644
--- a/mission_control-jobs.gemspec
+++ b/mission_control-jobs.gemspec
@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_dependency "rails", ">= 7.1"
+  spec.add_dependency "propshaft"
   spec.add_dependency "importmap-rails"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "stimulus-rails"