diff --git a/Makefile b/Makefile
index eb7237b4..4709a890 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,10 @@ ifeq ($(VERSION),)
 endif
 
 BUILD_TAGS = 'osusergo netgo static_build'
-LDFLAGS = -ldflags '-linkmode external -extldflags "-static" -X "github.com/flipkart-incubator/dkv/version.Version=$(VERSION)"'
+LDFLAGS = -ldflags '-linkmode external -extldflags "-static" -X "github.com/flipkart-incubator/dkv/meta.Version=$(VERSION)" -X "github.com/flipkart-incubator/dkv/meta.Release=Production"'
 
 ifeq ($(GOOS),darwin)
-	LDFLAGS = -ldflags '-X "github.com/flipkart-incubator/dkv/version.Version=$(VERSION)"'
+	LDFLAGS = -ldflags '-X "github.com/flipkart-incubator/dkv/meta.Version=$(VERSION)"'
 	BUILD_TAGS = 'osusergo netgo'
 endif
 
diff --git a/cmd/dkvsrv/main.go b/cmd/dkvsrv/main.go
index e563f8f3..1a055515 100644
--- a/cmd/dkvsrv/main.go
+++ b/cmd/dkvsrv/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/flipkart-incubator/dkv/meta"
 	"io"
 	"io/ioutil"
 	"log"
@@ -20,6 +21,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"gopkg.in/ini.v1"
 
+	"github.com/flipkart-incubator/dkv/internal"
 	"github.com/flipkart-incubator/dkv/internal/discovery"
 	"github.com/flipkart-incubator/dkv/internal/master"
 	"github.com/flipkart-incubator/dkv/internal/opts"
@@ -520,6 +522,11 @@ func setupHttpServer() {
 		router.HandleFunc("/debug/pprof/trace", pprof.Trace)
 	}
 
+	//Admin UI
+	liveMode := meta.Release == "Development"
+	fileSystem := internal.GetWWWFileSystem(liveMode)
+	router.PathPrefix("/admin/").Handler(http.StripPrefix("/admin/", http.FileServer(fileSystem)))
+
 	http.Handle("/", router)
 	http.ListenAndServe(config.HttpListenAddr, nil)
 }
diff --git a/go.mod b/go.mod
index f835daa3..4a09c6a4 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/flipkart-incubator/dkv
 
-go 1.15
+go 1.16
 
 require (
 	github.com/Jille/grpc-multi-resolver v1.0.0
diff --git a/internal/www.go b/internal/www.go
new file mode 100644
index 00000000..56cc7ec6
--- /dev/null
+++ b/internal/www.go
@@ -0,0 +1,49 @@
+package internal
+
+import (
+	"embed"
+	"fmt"
+	"io/fs"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+	"runtime"
+)
+
+//go:embed www
+var embededFiles embed.FS
+
+func getFileDir() string {
+	_, file, _, ok := runtime.Caller(0)
+	if !ok {
+		file = "./"
+	} else {
+		file = filepath.Dir(file)
+	}
+
+	dir := fmt.Sprintf("%s/www", file)
+	return dir
+}
+
+func GetWWWFileSystem(develMode bool) http.FileSystem {
+
+	if develMode {
+		dir := getFileDir()
+		log.Print("using live mode with Dir: ", dir)
+		return http.FS(os.DirFS(dir))
+	}
+
+	log.Println("using embed mode")
+	fSys, err := fs.Sub(embededFiles, "www")
+	if err != nil {
+		panic(err)
+	}
+
+	//fs.WalkDir(fsys, ".", func(p string, d fs.DirEntry, err error) error {
+	//	fmt.Println(p)
+	//	return nil
+	//})
+
+	return http.FS(fSys)
+}
diff --git a/internal/www/index.html b/internal/www/index.html
index 728567f5..66e61354 100644
--- a/internal/www/index.html
+++ b/internal/www/index.html
@@ -39,13 +39,13 @@
     <link href="//cdnjs.cloudflare.com/ajax/libs/c3/0.4.15/c3.css" rel="stylesheet" type="text/css">
 
     <!-- monitoring -->
-    <link rel="stylesheet" href="/css/main.css">
-    <script type="text/javascript" src="/js/main.js"></script>
-    <script type="text/javascript" src="/js/config.js"></script>
-    <script type="text/javascript" src="/js/controllers.js"></script>
-    <script type="text/javascript" src="/js/services.js"></script>
-    <script type="text/javascript" src="/js/directives.js"></script>
-    <script type="text/javascript" src="/js/lib.js"></script>
+    <link rel="stylesheet" href="/admin/css/main.css">
+    <script type="text/javascript" src="/admin/js/main.js"></script>
+    <script type="text/javascript" src="/admin/js/config.js"></script>
+    <script type="text/javascript" src="/admin/js/controllers.js"></script>
+    <script type="text/javascript" src="/admin/js/services.js"></script>
+    <script type="text/javascript" src="/admin/js/directives.js"></script>
+    <script type="text/javascript" src="/admin/js/lib.js"></script>
 
     <!-- css-->
     <style>
diff --git a/internal/www/js/config.js b/internal/www/js/config.js
index 2a41e88d..3426fd18 100644
--- a/internal/www/js/config.js
+++ b/internal/www/js/config.js
@@ -1,9 +1,9 @@
 CONFIG={
     "router": {
         "Home":{
-            "path":"/",
+            "path":"/admin/",
             "controller":"HomeCtrl",
-            "templateUrl": "home.html",
+            "templateUrl": "/admin/home.html",
         },
     },
 };
diff --git a/internal/www/js/controllers.js b/internal/www/js/controllers.js
index c0c06952..142a3f0b 100644
--- a/internal/www/js/controllers.js
+++ b/internal/www/js/controllers.js
@@ -67,9 +67,9 @@
             function($location, $scope, $rootScope ,$timeout, $sce, DKVService) {
             /* discover master nodes from here*/
                 $scope.masters = {
-                    "m1":"http://127.0.0.1:7081",
-                    "m2":"http://127.0.0.1:7082",
-                    "m3":"http://127.0.0.1:7083",
+                    "m1":"http://127.0.0.1:8081",
+                    "m2":"http://127.0.0.1:8082",
+                    "m3":"http://127.0.0.1:8083",
                 }
 
                 $scope.througputParser = througputParser
diff --git a/internal/www/js/directives.js b/internal/www/js/directives.js
index 104cc171..fe4f0d4e 100644
--- a/internal/www/js/directives.js
+++ b/internal/www/js/directives.js
@@ -4,7 +4,7 @@
         .directive("headerNav", function() {
             return {
                 restrict: "E",
-                templateUrl: "header-nav.html",
+                templateUrl: "/admin/header-nav.html",
                 controller: function($scope, $rootScope, $location, $sce) {
                     $scope.config = CONFIG;
                 }
diff --git a/internal/www/js/main.js b/internal/www/js/main.js
index 75ab49d5..02ba5556 100644
--- a/internal/www/js/main.js
+++ b/internal/www/js/main.js
@@ -11,7 +11,7 @@
                 });
             }
             $routeProvider.otherwise({
-                redirectTo: "/"
+                redirectTo: "/admin/"
             });
             $locationProvider.html5Mode(true);
         })
diff --git a/internal/www/run.sh b/internal/www/run.sh
deleted file mode 100644
index f4a4c5fb..00000000
--- a/internal/www/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-python -m SimpleHTTPServer 8989
\ No newline at end of file
diff --git a/version/version.go b/meta/meta.go
similarity index 68%
rename from version/version.go
rename to meta/meta.go
index afb84833..4a196c22 100644
--- a/version/version.go
+++ b/meta/meta.go
@@ -1,6 +1,8 @@
-package version
+package meta
 
 var (
 	// Version holds the latest version of the DKV binary
 	Version = "latest"
+
+	Release = "Development"
 )