diff --git a/Template/Website/Controllers/Api/ApiController.cs b/Template/Website/Controllers/Api/ApiController.cs
index bb8f772..e7181ad 100644
--- a/Template/Website/Controllers/Api/ApiController.cs
+++ b/Template/Website/Controllers/Api/ApiController.cs
@@ -1,12 +1,19 @@
 using Domain;
+using Microsoft.AspNetCore.Mvc;
+using Olive.GlobalSearch;
 using Olive.Mvc;
 using Olive.Security;
 using Olive.Web;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Linq;
 
 namespace Controllers
 {
     [JwtAuthenticate]
     public class ApiController : BaseController
     {
-    }
+       
+    }   
 }
\ No newline at end of file
diff --git a/Template/Website/Website.csproj b/Template/Website/Website.csproj
index 8151018..72d683f 100644
--- a/Template/Website/Website.csproj
+++ b/Template/Website/Website.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
-    <TypeScriptToolsVersion>2.8</TypeScriptToolsVersion>
+    <TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TieredCompilation>true</TieredCompilation>
   </PropertyGroup>
diff --git a/Template/Website/wwwroot/scripts/appPage.js b/Template/Website/wwwroot/scripts/appPage.js
index 80fb8c5..09cdfb4 100644
--- a/Template/Website/wwwroot/scripts/appPage.js
+++ b/Template/Website/wwwroot/scripts/appPage.js
@@ -23,6 +23,7 @@ define(["require", "exports", "olive/olivePage"], function (require, exports, ol
             _super.prototype.initialize.call(this);
             // This function is called upon every Ajax update as well as the initial page load.
             // Any custom initiation goes here.
+            //Override the 'enableCustomCheckbox' and 'enableCustomRadio' with empty methods to use the original controls.
         };
         return AppPage;
     }(olivePage_1.default));
diff --git a/Template/Website/wwwroot/styles/FrontEnd.scss b/Template/Website/wwwroot/styles/FrontEnd.scss
index 18ac61a..f31bc34 100644
--- a/Template/Website/wwwroot/styles/FrontEnd.scss
+++ b/Template/Website/wwwroot/styles/FrontEnd.scss
@@ -4,6 +4,7 @@
 @import "imports/bootstrap-social";
 @import "imports/print";
 @import "controls/controls";
+@import "controls/globalsearch.scss";
 
 $footer-height: 90px;
 $footer-top-margin: 30px;
diff --git a/Template/Website/wwwroot/styles/controls/globalsearch.scss b/Template/Website/wwwroot/styles/controls/globalsearch.scss
new file mode 100644
index 0000000..f67e95c
--- /dev/null
+++ b/Template/Website/wwwroot/styles/controls/globalsearch.scss
@@ -0,0 +1,92 @@
+/* Global Search Styles */
+.global-search-panel {
+    padding: 0.5rem 1rem;
+}
+
+.global-search-result-panel {
+    position: absolute;
+    z-index: 99;
+    background-color: white;
+    width: 600px;
+    border-radius: 0 0 5px 5px;
+    border: solid thin #ddd;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+}
+
+.global-search-result-panel ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 10px;
+    overflow-y: scroll;
+}
+
+.global-search-result-panel li {
+    margin-top: 10px;
+}
+
+.global-search-result-panel li:hover {
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    background-color: #f7f7f7;
+}
+
+.global-search-result-panel a {
+    color: black;
+    text-decoration: none;
+}
+
+.global-search-result-panel a:hover {
+    text-decoration: none;
+}
+
+.global-search-result-panel .item-div {
+    display: flex;
+}
+
+.global-search-result-panel .item-icon {
+    float: left;
+}
+
+.global-search-result-panel img {
+    width: 64px;
+}
+
+.global-search-result-panel .item-title-wrapper {
+    float: left;
+    margin: 0 0 0 10px;
+}
+
+.global-search-result-panel .item-title {
+    color: #333;
+}
+
+.global-search-result-panel .item-description {
+    color: #777;
+}
+
+.global-search-result-panel p {
+    text-wrap: normal;
+}
+
+.global-search-result-panel .summary {
+    color: #6b6b6b;
+    margin: auto;
+    background-color: #f5f5f5;
+    padding-left: 10px;
+}
+
+.global-search-result-panel .summary-element.success {
+    font-weight: lighter;
+    font-size: x-small;
+}
+
+.global-search-result-panel .summary-element.warning {
+    font-weight: lighter;
+    font-size: x-small;
+    color: #e38001;
+}
+
+.global-search-result-panel .summary-element.failed {
+    font-weight: lighter;
+    font-size: x-small;
+    color: #ad3535;
+}