diff --git a/docs/Scientific_Computing/Supported_Applications/index.md b/docs/Scientific_Computing/Supported_Applications/index.md
index 0ab4dc585..0a19fc08f 100644
--- a/docs/Scientific_Computing/Supported_Applications/index.md
+++ b/docs/Scientific_Computing/Supported_Applications/index.md
@@ -1,11 +1,10 @@
 ---
 title: Supported Applications
+template: supportedApplications.html
 ---
 
-<!-- template: supportedApplications.html -->
-
-
-=== "Mahuika"
+For more information on environment-modules see [Finding Software](../HPC_Software_Environment/Finding_Software.md).
+<!-- === "Mahuika"
 
     On Mahuika, and Ancillary nodes (both Mahuika and Māui) software packages are provided using 'lmod' an implementation of Environment Modules with [additional features](https://lmod.readthedocs.io/en/latest/010_user.html).
     
@@ -15,4 +14,4 @@ title: Supported Applications
 
     On Māui (XC50), software packages are provided using traditional Environment Modules. No modules are loaded by default.
     
-    A list of available software can be obtained with the `module avail` command.
+    A list of available software can be obtained with the `module avail` command. -->
diff --git a/docs/assets/stylesheets/supportedApplications.css b/docs/assets/stylesheets/supportedApplications.css
index c0269ec46..7163eabc5 100644
--- a/docs/assets/stylesheets/supportedApplications.css
+++ b/docs/assets/stylesheets/supportedApplications.css
@@ -61,6 +61,19 @@
     color:  var(--md-primary-bg-color);
     background-color: #972220;
 }
+
+.grid.flex-card-parent {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-content: stretch;
+    align-items: stretch;
+    justify-content: space-between;
+}
+
+.flex-card {
+    flex-grow: 1;
+}
 .app-list-header {
       display: inline;
       }
@@ -248,3 +261,7 @@ div#updated {
 #srchbar{
     border-right:0;
 }
+.md-source-file{
+    display: none; 
+    /* This is lazy */
+}
\ No newline at end of file
diff --git a/overrides/partials/.appCardBig.html.dep b/overrides/partials/.appCardBig.html.dep
deleted file mode 100644
index 6bf04f373..000000000
--- a/overrides/partials/.appCardBig.html.dep
+++ /dev/null
@@ -1,13 +0,0 @@
-<p>{{ app.description }}</p>
-{% if app.homepage or app.url -%}
-<p><span class="twemoji">{% include ".icons/material/home.svg" %}</span>
-<a href="{{ app.homepage or app.url }}">{{ application }} Homepage</a></p>
-{% endif -%}
-{% if app.licence_type == "proprietary" -%}<!-- <h2 id="licence">Licence</h2> -->
-<div class="admonition warning">
-    <p class="admonition-title">Licence</p>
-<p>{{ application }} is proprietary software. Make sure you meet the requirements for it's usage.</p>
-</div>
-{% endif -%}
-<h2 id="modules">Modules Available</h2>
-{% include "partials/appVersion.html" -%}
\ No newline at end of file
diff --git a/overrides/partials/appCard.html b/overrides/partials/appCard.html
index 92a9c4982..9d59092d1 100644
--- a/overrides/partials/appCard.html
+++ b/overrides/partials/appCard.html
@@ -25,15 +25,18 @@ <h4 class="app-list-header">{{ app_name }}</h4>
         <div class="card-body card-app">
             <p class="cardbody cardbody-description">{{ app.description }}</p>
             <!-- <div class="cardbody cardbody-info"> -->
-            <div class="grid cards">
-            {% include "partials/appVersion.html" -%}
-                    <div>
-                    <span class="bold">Links</span>
+            <div class="grid flex-card-parent">
+                <div class="flex-card">
+                    <h5>Available Modules</h5>
+                    {% include "partials/appVersion.html" -%}
+                </div>
+                <div class="flex-card">
+                    <h5>Links</h5>
                     <ul class="docLinks-list">
                     {% if app.homepage or app.url -%}
                     <li class="support"><span class="twemoji">
-{% include ".icons/material/home.svg" %}</span>
-<a href="{{ app.homepage or app.url }}">
+                    {% include ".icons/material/home.svg" %}</span>
+                    <a href="{{ app.homepage or app.url }}">
                     {{ app_name }} Homepage</a></li>
                     {% endif -%}
                     {% if app.support -%}
@@ -41,18 +44,18 @@ <h4 class="app-list-header">{{ app_name }}</h4>
                     {% endif -%}
                     </ul>
                 </div>
-            </div>
-        {% if app.licence_type %}
-        <span>
-            <span class="warning badge badge-licence badge-licence-{{ app.licence_type }}" style="margin-left: -2em;float: left;">
-            </span>
-            <p>Licence {{ app_name }} is {{ app.licence_type }} software.</p>
-        {% if app.licences %}
-            <p>Access to a valid licence token is required to run {{ app_name }}, a list of which can be found 
-            <a href="{{ app.support }}#licences">here</a>.</p>
-        {% endif %}
-        </span">
-        {% endif %}
+            {% if app.licence_type %}
+                <div class="flex-card">
+                <h5>Licence</h5>
+                <span class="warning badge badge-licence badge-licence-{{ app.licence_type }}" style="margin-left: -2em;float: left;"></span>
+                <p>Licence {{ app_name }} is {{ app.licence_type }} software.</p>
+                {% if app.network_licences %}
+                    <p>Access to a valid licence token is required to run {{ app_name }}.
+                    {% include "partials/appNetworkLicence.html" -%}
+                {% endif %}
+                </div>
+            {% endif %}
+        </div>
     </div>
 </div>
 </details>
\ No newline at end of file
diff --git a/overrides/partials/appHeader.md b/overrides/partials/appHeader.md
index 3831c73c6..e6a7de53a 100644
--- a/overrides/partials/appHeader.md
+++ b/overrides/partials/appHeader.md
@@ -21,6 +21,8 @@
 
 ## Licences
 
+<p>The following network licence servers can be accessed from the NeSI cluster.</p>
 {% include "partials/appNetworkLicence.html" -%}
+<p>If you do not have access, or want a server connected {% include "partials/support_request.html" %}.</p>
 
 {% endif -%}
diff --git a/overrides/partials/appNetworkLicence.html b/overrides/partials/appNetworkLicence.html
index dc5703328..696e3aa2e 100644
--- a/overrides/partials/appNetworkLicence.html
+++ b/overrides/partials/appNetworkLicence.html
@@ -1,5 +1,3 @@
-<p>The following network licence servers can be accessed from the NeSI cluster.</p>
-<p>If you do not have access, or want a server connected {% include "partials/support_request.html" %}.</p>
 <table>
     <thead>
     <tr>
diff --git a/overrides/partials/supportedApplicationsList.html b/overrides/partials/supportedApplicationsList.html
index 487098a89..7a33d9c1d 100644
--- a/overrides/partials/supportedApplicationsList.html
+++ b/overrides/partials/supportedApplicationsList.html
@@ -1,5 +1,7 @@
 <div class="article__body markdown" itemprop="articleBody">
   <div class="layoutrow">
+        <!-- <script src="{{ base_url }}/js/somelib.js"></script> -->
+
         <!-- <div id="updated" style="display: flex;">Updated:&nbsp;<div id="updated_timestamp">time</div></div> -->
         <div class="input-group mb-3">
             <div class="md-search__icon md-icon">
@@ -25,4 +27,6 @@
         </div>
         <br>
     </div>
+    <p>If the application you are looking for is not here you can make <a href="https://support.nesi.org.nz/hc/en-gb/articles/360000361675-Software-Installation-Request">software installation</a> request or try <a href="https://support.nesi.org.nz/hc/en-gb/sections/360000040056-HPC-Software-Environment"> compiling it yourself.</a></p>
+    <em>You can help contribute to this list by tagging software <a href="https://github.com/nesi/modlist/blob/master/tags_domains.json">here</a>.</em>
 </div>
diff --git a/overrides/supportedApplications.html b/overrides/supportedApplications.html
index e93ce231a..ab8512e38 100644
--- a/overrides/supportedApplications.html
+++ b/overrides/supportedApplications.html
@@ -1,9 +1,18 @@
 {% extends "base.html" -%}
 {% block head -%}
 {% endblock -%}
+{% block libs %}
+    {{ super() }}
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
+    <script src="{{ base_url }}/assets/javascripts/supportedApplications.js"></script>
+    <!-- Would be good if we could remove dependency on jq -->
+{% endblock -%}
+{% block styles %}
+{{ super() }}
+<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/supportedApplications.css">
+{% endblock -%}
+
 {% block content -%}
     {{ super() }}
     {% include "partials/supportedApplicationsList.html" %}
-<p>If the application you are looking for is not here you can make <a href="https://support.nesi.org.nz/hc/en-gb/articles/360000361675-Software-Installation-Request">software installation</a> request or try <a href="https://support.nesi.org.nz/hc/en-gb/sections/360000040056-HPC-Software-Environment"> compiling it yourself.</a></p>
-<em>You can help contribute to this list by tagging software <a href="https://github.com/nesi/modlist/blob/master/tags_domains.json">here</a>.</em>
 {% endblock %}
\ No newline at end of file