diff --git a/ccp/js/executionformcontroller.js b/ccp/js/executionformcontroller.js
index 604a73c..014c3b0 100644
--- a/ccp/js/executionformcontroller.js
+++ b/ccp/js/executionformcontroller.js
@@ -92,7 +92,7 @@ class CCPExecutionForm extends HTMLElement{
                   <button id="execute_method_button" class="btn btn-info">Execute</button>
                 </div>
                 <div class="col-6">
-                  <div class="">
+                  <div class="mb-3">
                     <label>Generate code for:</label>
                     <div class="d-flex">
                       <select name="language-selector" class="form-control" style="padding:2px">
@@ -107,11 +107,11 @@ class CCPExecutionForm extends HTMLElement{
                         </svg>
                       </button>
                     </div>
-                    <div class="">
+                  </div>
+                  <div>
                     <label>Direct link</label>
-                      <div class="d-flex">
-                        <a name="direct_link_method" href="${window.location.href}">${window.location.href}</a>
-                      </div>
+                    <div class="d-flex">
+                      <a name="direct_link_method" href="${window.location.href}">${window.location.href}</a>
                     </div>
                   </div>
                 </div>
diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 794817b..a1fd1cc 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -120,18 +120,26 @@ class CCPExecutionHistory extends HTMLElement {
                       <li></li>
                     </ul>
                     <div class="d-flex justify-content-end" style="gap: 3px;">
-                      <label>Generate code for:</label>
-                      <select name="language-selector" class="form-control" style="max-width:10rem;height:inherit;padding:2px">
-                        <option value="text/python" data-ext="py" title="Generate plain Python3">Python 3</option>
-                        <option value="text/plain+r" data-ext="r" title="Generate plain R">R</option>
-                        <option value="application/vnd.jupyter+python" data-ext="ipynb" title="Generate Jupyter notebook with Python 3 cells">Jupyter Python3</option>
-                        <option value="text/julia" data-ext="jl" title="Generate Julia 1.9.0 code (HTTP 1.10.0, JSON3 1.13.2)">Julia 1.9.0</option>
-                      </select>
-                      <button data-index="0" name="codegen" title="Generate code" class="btn btn-primary ccp-toolbar-button ccp-toolbar-button-small">
-                        <svg viewBox="0 96 960 960">
-                          <path d="m384 721 43-43-101-102 101-101-43-43-144 144.5L384 721Zm192 0 145-145-144-144-43 43 101 101-102 102 43 43ZM180 936q-24.75 0-42.375-17.625T120 876V276q0-24.75 17.625-42.375T180 216h205q5-35 32-57.5t63-22.5q36 0 63 22.5t32 57.5h205q24.75 0 42.375 17.625T840 276v600q0 24.75-17.625 42.375T780 936H180Zm0-60h600V276H180v600Zm300-617q14 0 24.5-10.5T515 224q0-14-10.5-24.5T480 189q-14 0-24.5 10.5T445 224q0 14 10.5 24.5T480 259ZM180 876V276v600Z"/>
-                        </svg>
-                      </button>
+                      <div class="d-flex align-items-middle" style="gap:5px">
+                        <label>Generate code for:</label>
+                        <select name="language-selector" class="form-control">
+                          <option value="text/python" data-ext="py" title="Generate plain Python3">Python 3</option>
+                          <option value="text/plain+r" data-ext="r" title="Generate plain R">R</option>
+                          <option value="application/vnd.jupyter+python" data-ext="ipynb" title="Generate Jupyter notebook with Python 3 cells">Jupyter Python3</option>
+                          <option value="text/julia" data-ext="jl" title="Generate Julia 1.9.0 code (HTTP 1.10.0, JSON3 1.13.2)">Julia 1.9.0</option>
+                        </select>
+                        <button data-index="0" name="codegen" title="Generate code" class="btn btn-primary ccp-toolbar-button ccp-toolbar-button-small">
+                          <svg viewBox="0 96 960 960">
+                            <path d="m384 721 43-43-101-102 101-101-43-43-144 144.5L384 721Zm192 0 145-145-144-144-43 43 101 101-102 102 43 43ZM180 936q-24.75 0-42.375-17.625T120 876V276q0-24.75 17.625-42.375T180 216h205q5-35 32-57.5t63-22.5q36 0 63 22.5t32 57.5h205q24.75 0 42.375 17.625T840 276v600q0 24.75-17.625 42.375T780 936H180Zm0-60h600V276H180v600Zm300-617q14 0 24.5-10.5T515 224q0-14-10.5-24.5T480 189q-14 0-24.5 10.5T445 224q0 14 10.5 24.5T480 259ZM180 876V276v600Z"/>
+                          </svg>
+                        </button>
+                      </div>
+                      <div class="d-flex align-items-middle" style="gap:5px">
+                        <label>Direct link</label>
+                        <div class="d-flex">
+                          <a name="direct_link_execution" href="${window.location.href}">${window.location.href}</a>
+                        </div>
+                      </div>
                     </div>
                   </details>
                 </li>
@@ -657,6 +665,10 @@ class CCPExecutionHistory extends HTMLElement {
                   this.generateCode(id, lang, `${id}.${ext}`)
                 }
               },
+              {
+                target : "a[name=direct_link_execution]",              
+                apply : (e,d)=>e.href = e.textContent = window.location.origin + window.location.path + "?execution=" + d.id
+              },
               {
                 target : "div[name=logterminalcontainer]",
                 apply : (e,d)=>{