diff --git a/ccp/js/executionformcontroller.js b/ccp/js/executionformcontroller.js
index 014c3b0..6270cc2 100644
--- a/ccp/js/executionformcontroller.js
+++ b/ccp/js/executionformcontroller.js
@@ -406,7 +406,7 @@ class CCPExecutionForm extends HTMLElement{
       },
       {
         target: "a[name=direct_link_method]",
-        apply : (e,d)=>e.href = e.textContent = window.location.origin + window.location.path + "?method=" + d.id
+        apply : (e,d)=>e.href = e.textContent = window.location.origin + window.location.pathname + "?method=" + d.id
       }
     ]
   }
diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index a1fd1cc..5b9f544 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -119,7 +119,7 @@ class CCPExecutionHistory extends HTMLElement {
                     <ul>
                       <li></li>
                     </ul>
-                    <div class="d-flex justify-content-end" style="gap: 3px;">
+                    <div class="d-flex flex-column align-items-end" style="gap: 3px;">
                       <div class="d-flex align-items-middle" style="gap:5px">
                         <label>Generate code for:</label>
                         <select name="language-selector" class="form-control">
@@ -166,8 +166,9 @@ class CCPExecutionHistory extends HTMLElement {
               <div class="d-flex" style="gap:2px">
                 <input type="text" class="form-control" placeholder="Paste link here"/>
                 <button name="archive" class="btn btn-primary ccp-toolbar-button m-0" title="Upload from link">
-                  <svg viewBox="0 96 960 960"><path d="M450 776H280q-83 0-141.5-58.5T80 576q0-83 58.5-141.5T280 376h170v60H280q-58.333 0-99.167 40.765-40.833 40.764-40.833 99Q140 634 180.833 675q40.834 41 99.167 41h170v60ZM324 606v-60h310v60H324Zm556-30h-60q0-58-40.833-99-40.834-41-99.167-41H510v-60h170q83 0 141.5 58.5T880 576ZM699 896V776H579v-60h120V596h60v120h120v60H759v120h-60Z"/></svg>
-                
+                  <svg viewBox="0 96 960 960">
+                    <path d="M450 776H280q-83 0-141.5-58.5T80 576q0-83 58.5-141.5T280 376h170v60H280q-58.333 0-99.167 40.765-40.833 40.764-40.833 99Q140 634 180.833 675q40.834 41 99.167 41h170v60ZM324 606v-60h310v60H324Zm556-30h-60q0-58-40.833-99-40.834-41-99.167-41H510v-60h170q83 0 141.5 58.5T880 576ZM699 896V776H579v-60h120V596h60v120h120v60H759v120h-60Z"/>
+                  </svg>  
                 </button>
               </div>
             </div>
@@ -667,7 +668,7 @@ class CCPExecutionHistory extends HTMLElement {
               },
               {
                 target : "a[name=direct_link_execution]",              
-                apply : (e,d)=>e.href = e.textContent = window.location.origin + window.location.path + "?execution=" + d.id
+                apply : (e,d)=>e.href = e.textContent = window.location.origin + window.location.pathname + "?execution=" + d.id
               },
               {
                 target : "div[name=logterminalcontainer]",