diff --git a/tutordash/server/app.py b/tutordash/server/app.py
index 6ff9a2d..47ff017 100644
--- a/tutordash/server/app.py
+++ b/tutordash/server/app.py
@@ -72,9 +72,21 @@ async def plugin_store() -> str:
 
 @app.get("/plugin/installed")
 async def installed_plugins() -> str:
+    installed_plugins = tutorclient.Client.installed_plugins()
+    enabled_plugins = tutorclient.Client.enabled_plugins()
+    plugins: list[dict[str, str]] = [
+        {
+            "name": p.name,
+            "url": p.url,
+            "index": p.index,
+            "description": markdown(p.description),
+            "is_enabled": p.name in enabled_plugins,
+        }
+        for p in tutorclient.Client.plugins_in_store() if p.name in installed_plugins
+    ]
     return await render_template(
         "installed_plugins.html",
-        # plugins=plugins,
+        plugins=plugins,
         **shared_template_context(),
     )
 
diff --git a/tutordash/server/templates/installed_plugins.html b/tutordash/server/templates/installed_plugins.html
index 23de559..af2c279 100644
--- a/tutordash/server/templates/installed_plugins.html
+++ b/tutordash/server/templates/installed_plugins.html
@@ -1,33 +1,23 @@
-{% extends "index.html" %}
+{% extends "workspace_header_general.html" %}
 
-{% block workspace_header %}
-<div>
-    <div class="title">My Plugins</div>
-    <div class="description">View all your installed plugins in one place.</div>
-</div>
-<div class="local-launch-button">
-    <form action="{{ url_for('plugins_update') }}" method="POST">
-        <button type="submit">Local Launch</button>
-    </form>
-</div>
+{% block page_title %}Plugin Marketplace{% endblock %}
+{% block page_description %}View and install available plugins.{% endblock %}
+{% block page_button %}
+<form action="{{ url_for('plugins_update') }}" method="POST">
+    <button class="btn btn-primary" type="submit">Local Launch</button>
+</form>
 {% endblock %}
 
 {% block workspace_content %}
-<div class="search-row">
-    <div class="search-container">
-        <input type="text" class="form-control search-input" placeholder="Search">
-        <i class="fas fa-search search-icon"></i>
-    </div>
-</div>
-<!-- <form action="{{ url_for('plugins_update') }}" method="POST">
-    <button type="submit">Refresh</button>
-</form> -->
-
-<div class="my-plugins-list">
-    {% for plugin in installed_plugins %}
-    <div>
-        <li>
-            <a href="{{ url_for('plugin', name=plugin) }}">{{ plugin }}</a>
+<div class="installed-plugins-list">
+    {% for plugin in plugins %}
+    <div class="installed-plugin">
+        <div>
+            <div><a href="{{ url_for('plugin', name=plugin) }}">{{ plugin.name }}</a></div>
+            <div>Edly</div>
+            <div>{{ plugin.description|safe }}</div>
+        </div>
+        <div>
             <form method="POST" action="{{ url_for('plugin_toggle', name=plugin_name) }}">
                 {% if plugin in enabled_plugins %} 
                     <input class="form-check-input" id="flexSwitchCheckChecked" type="checkbox" onchange="this.form.submit()" checked {% if is_enabled %}checked{% endif %} />
@@ -36,7 +26,7 @@
                 <!-- <input class="form-check-input" id="flexSwitchCheckChecked" type="checkbox" onchange="this.form.submit()" checked /> -->
                 {% endif %}
             </form>
-        </li>
+        </div>
     </div>
     {% endfor %}
 </div>
diff --git a/tutordash/server/templates/workspace_header_general.html b/tutordash/server/templates/workspace_header_general.html
index 420cafd..bbc043c 100644
--- a/tutordash/server/templates/workspace_header_general.html
+++ b/tutordash/server/templates/workspace_header_general.html
@@ -6,8 +6,8 @@
         <div class="page-title">{% block page_title %}{% endblock %}</div>
         <div class="page-description">{% block page_description %}{% endblock %}</div>
     </div>
-    <div>
-        <div>{% block page_button %}{% endblock %}</div>
+    <div class="launch-button">
+        {% block page_button %}{% endblock %}
     </div>
 </div>
 <div class="search-container">