diff --git a/install.yml b/install.yml
index 494e589..f1a0252 100644
--- a/install.yml
+++ b/install.yml
@@ -10,12 +10,11 @@ requirements:
   skip: false
   conda:
     channels:
-      - conda-forge
+    - conda-forge
     packages:
-      - pandas
-
+    - pandas
   pip:
 
   npm:
 
-post:
\ No newline at end of file
+post:
diff --git a/tethysapp/map_layout_tutorial/app.py b/tethysapp/map_layout_tutorial/app.py
index 0a77add..dd78f5d 100644
--- a/tethysapp/map_layout_tutorial/app.py
+++ b/tethysapp/map_layout_tutorial/app.py
@@ -1,7 +1,7 @@
 from tethys_sdk.base import TethysAppBase
 
 
-class MapLayoutTutorial(TethysAppBase):
+class App(TethysAppBase):
     """
     Tethys app class for Map Layout Tutorial.
     """
diff --git a/tethysapp/map_layout_tutorial/controllers.py b/tethysapp/map_layout_tutorial/controllers.py
index 8e5ad10..b8b32a8 100644
--- a/tethysapp/map_layout_tutorial/controllers.py
+++ b/tethysapp/map_layout_tutorial/controllers.py
@@ -1,11 +1,10 @@
 from tethys_sdk.layouts import MapLayout
 from tethys_sdk.routing import controller
-from .app import MapLayoutTutorial as app
-
+from .app import App
 
 @controller(name="home", app_workspace=True)
 class MapLayoutTutorialMap(MapLayout):
-    app = app
-    base_template = 'map_layout_tutorial/base.html'
+    app = App
+    base_template = f'{App.package}/base.html'
     map_title = 'Map Layout Tutorial'
-    map_subtitle = 'NOAA-OWP NextGen Model Outputs'
+    map_subtitle = 'NOAA-OWP NextGen Model Outputs'
\ No newline at end of file
diff --git a/tethysapp/map_layout_tutorial/public/images/noaa_digital_logo-2022.png b/tethysapp/map_layout_tutorial/public/images/noaa_digital_logo-2022.png
index be71465..57e7adc 100644
Binary files a/tethysapp/map_layout_tutorial/public/images/noaa_digital_logo-2022.png and b/tethysapp/map_layout_tutorial/public/images/noaa_digital_logo-2022.png differ
diff --git a/tethysapp/map_layout_tutorial/workspaces/app_workspace/.gitkeep b/tethysapp/map_layout_tutorial/resources/.gitkeep
similarity index 100%
rename from tethysapp/map_layout_tutorial/workspaces/app_workspace/.gitkeep
rename to tethysapp/map_layout_tutorial/resources/.gitkeep
diff --git a/tethysapp/map_layout_tutorial/templates/map_layout_tutorial/base.html b/tethysapp/map_layout_tutorial/templates/map_layout_tutorial/base.html
index 4b62f71..2568bdc 100644
--- a/tethysapp/map_layout_tutorial/templates/map_layout_tutorial/base.html
+++ b/tethysapp/map_layout_tutorial/templates/map_layout_tutorial/base.html
@@ -1,6 +1,6 @@
 {% extends "tethys_apps/app_base.html" %}
 
-{% load static %}
+{% load static tethys %}
 
 {% block title %}{{ tethys_app.name }}{% endblock %}
 
@@ -33,10 +33,10 @@
 
 {% block content_dependent_styles %}
   {{ block.super }}
-  <link href="{% static 'map_layout_tutorial/css/main.css' %}" rel="stylesheet"/>
+  <link href="{% static tethys_app|public:'css/main.css' %}" rel="stylesheet"/>
 {% endblock %}
 
 {% block scripts %}
   {{ block.super }}
-  <script src="{% static 'map_layout_tutorial/js/main.js' %}" type="text/javascript"></script>
+  <script src="{% static tethys_app|public:'js/main.js' %}" type="text/javascript"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/tethysapp/map_layout_tutorial/templates/map_layout_tutorial/home.html b/tethysapp/map_layout_tutorial/templates/map_layout_tutorial/home.html
index ef4789c..42c196a 100644
--- a/tethysapp/map_layout_tutorial/templates/map_layout_tutorial/home.html
+++ b/tethysapp/map_layout_tutorial/templates/map_layout_tutorial/home.html
@@ -1,5 +1,5 @@
-{% extends "map_layout_tutorial/base.html" %}
-{% load tethys_gizmos %}
+{% extends tethys_app.package|add:"/base.html" %}
+{% load tethys %}
 
 {% block header_buttons %}
   <div class="header-button glyphicon-button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Help">
diff --git a/tethysapp/map_layout_tutorial/workspaces/user_workspaces/.gitkeep b/tethysapp/map_layout_tutorial/workspaces/user_workspaces/.gitkeep
deleted file mode 100644
index e69de29..0000000