diff --git a/resources/views/api_docs/index.blade.php b/resources/views/api_docs/index.blade.php
index 2fe1412..ae9ed8f 100755
--- a/resources/views/api_docs/index.blade.php
+++ b/resources/views/api_docs/index.blade.php
@@ -167,8 +167,8 @@
             </div>
             <button type="button" id="scroll" name="button" class="btn btn-warning pull-right">Scroll Up</button>
         </div>
-        <script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
-        <script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/ace/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ Request::secure(Request::root()).'js/src-min-noconflict/ace.js' }}" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ Request::secure(Request::root()).'js/ace/jquery-1.8.3.min.js' }}" type="text/javascript" charset="utf-8"></script>
         <script>
         window.onload(function () {
             document.getElementById('query').style.display = 'none';
diff --git a/resources/views/app/edit.blade.php b/resources/views/app/edit.blade.php
index dde663b..7936059 100755
--- a/resources/views/app/edit.blade.php
+++ b/resources/views/app/edit.blade.php
@@ -106,7 +106,7 @@
                                     @endif
                                 </div>
                             </div>
-
+                             
                             <div class="form-group">
                                 <div class="col-lg-offset-2 col-lg-10">
                                     <!-- Button trigger modal -->
@@ -123,7 +123,7 @@
         </div>
     </div>
     <!--body wrapper end-->
-
+    
 <!-- Modal -->
 <div class="modal fade" id="connect-to-app" tabindex="-1" role="dialog" aria-labelledby="Label" aria-hidden="true">
   <div class="modal-dialog" role="document">
@@ -147,19 +147,19 @@
                                  <pre>
 <code class="language-markup"><xmp style="word-wrap: break-word;
 ">
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/devless-sdk.js" class="devless-connection" devless-con-token="{{$app->token}}"></script>
+<script src="{{URL::to('/')}}/js/devless-sdk.js" class="devless-connection" devless-con-token="{{$app->token}}"></script>
 
 </xmp></code></pre>
-
+                                
                             </div>
                             <div class="tab-pane" id="android"><center>NA</center></div>
 			  <div class="tab-pane" id="ios"><center>NA</center></div>
                                   <div class="tab-pane" id="raw"><center>
-                                          Domain:
+                                          Domain: 
                               </center></div>
 			</div>
       </div>
-
+      
     </div>
   </div>
 </div>
diff --git a/resources/views/auth/create.blade.php b/resources/views/auth/create.blade.php
index edf499b..700ef6d 100755
--- a/resources/views/auth/create.blade.php
+++ b/resources/views/auth/create.blade.php
@@ -30,45 +30,24 @@
     <div class="wrapper">
       <div class="row">
         <a href="https://devless.io">
-          <img src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>img/logo.png" class="setup-logo" alt="Devless">
+          <img src="{{Request::secure(Request::root()).'img/logo.png'}}" class="setup-logo" alt="Devless">
         </a>
         <div class="col-lg-6 col-md-offset-3 col-sm-10 col-sm-offset-1">
           <section class="panel">
             <header class="panel-heading">
-              DB & App Setup
+              App Setup
             </header>
             <div class="panel-body">
-              <form action="{{ url('/install') }}" class="form-horizontal" method="POST">
-                <div class="form-group @if($errors->has('db_name')) has-error @endif">
-                    <label for="db_name" class="col-lg-2 control-label">DB Name</label>
-                    <div class="col-lg-10">
-                      <input type="text" id="db_name-field" name="db_name" class="form-control" required="">
-                         @if($errors->has("db_name"))
-                            <span class="help-block">{{ $errors->first("db_name") }}</span>
-                         @endif
-                    </div>
-                </div>
-                <div class="form-group @if($errors->has('db_user')) has-error @endif" >
-                  <label for="db_user" class="col-lg-2 control-label">DB User</label>
+              <form action="{{ url('/setup') }}" class="form-horizontal" method="POST">
+                <div class="form-group @if($errors->has('username')) has-error @endif" >
+                  <label for="username" class="col-lg-2 control-label">Username</label>
                   <div class="col-lg-10">
-                    <input type="text" id="db_user-field" name="db_user" class="form-control" required="">
-                    @if($errors->has("db_user"))
-                      <span class="help-block">{{ $errors->first("db_user") }}</span>
+                    <input type="text" id="username-field" name="username" class="form-control" required="">
+                    @if($errors->has("username"))
+                      <span class="help-block">{{ $errors->first("username") }}</span>
                     @endif
                   </div>
                 </div>
-                <div class="form-group @if($errors->has('db_pass')) has-error @endif" >
-                  <label for="db_pass" class="col-lg-2 control-label">DB Pass</label>
-                  <div class="col-lg-10">
-                    <input type="text" id="db_pass-field" name="db_pass" class="form-control" required="">
-                    @if($errors->has("db_pass"))
-                      <span class="help-block">{{ $errors->first("db_pass") }}</span>
-                    @endif
-                  </div>
-                </div>
-
-                <hr>
-
                 <div class="form-group @if($errors->has('email')) has-error @endif" >
                   <label for="email" class="col-lg-2 control-label">Email</label>
                   <div class="col-lg-10">
@@ -99,11 +78,33 @@
                   </div>
                 </div>
 
-
-                    <input type="hidden" id="app_name-field" name="app_name" class="form-control" required="" value="My Backend">
-
-                    <input type="hidden" id="app_token-field" name="app_token" class="form-control" readonly="" value="{{$app['app_token']}}">
-
+                <div class="form-group @if($errors->has('app_name')) has-error @endif" >
+                  <label for="app_name" class="col-lg-2 control-label">App Name</label>
+                  <div class="col-lg-10">
+                    <input type="text" id="app_name-field" name="app_name" class="form-control" required="">
+                    @if($errors->has("app_name"))
+                      <span class="help-block">{{ $errors->first("app_name") }}</span>
+                    @endif
+                  </div>
+                </div>
+                <div class="form-group @if($errors->has('app_description')) has-error @endif">
+                    <label for="app_description" class="col-lg-2 control-label">App Description</label>
+                    <div class="col-lg-10">
+                        <textarea class="form-control" id="app_description-field" rows="3" name="app_description"></textarea>
+                         @if($errors->has("app_description"))
+                            <span class="help-block">{{ $errors->first("app_description") }}</span>
+                         @endif
+                    </div>
+                </div>
+                <div class="form-group @if($errors->has('app_token')) has-error @endif" >
+                  <label for="app_token" class="col-lg-2 control-label">App Token</label>
+                  <div class="col-lg-10">
+                    <input type="text" id="app_token-field" name="app_token" class="form-control" readonly="" value="{{$app['app_token']}}">
+                    @if($errors->has("app_token"))
+                      <span class="help-block">{{ $errors->first("app_token") }}</span>
+                    @endif
+                  </div>
+                </div>
 
                 <div class="form-group">
                   <div class="col-lg-offset-2 col-lg-10">
diff --git a/resources/views/auth/index.blade.php b/resources/views/auth/index.blade.php
index 8af6961..1133443 100755
--- a/resources/views/auth/index.blade.php
+++ b/resources/views/auth/index.blade.php
@@ -9,8 +9,8 @@
         </div>
     </div>
 </div>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/jquery-1.10.2.min.js"></script>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/bootstrap.min.js"></script>
+<script src="{{Request::secure(Request::root()).'/js/jquery-1.10.2.min.js'}}"></script>
+<script src="{{Request::secure(Request::root()).'/js/bootstrap.min.js'}}"></script>
 <script charset="utf-8">
         $(function modal() {
             $('#flash_msg').modal({
@@ -33,7 +33,7 @@ function modalHide() {
     <div class="wrapper">
       <div class="row">
         <a href="https://devless.io">
-          <img src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>img/logo.png" class="login-logo" alt="Devless">
+          <img src="{{Request::secure(Request::root()).'/img/logo.png'}}" class="login-logo" alt="Devless">
         </a>
           <center>
         <div class="col-lg-6 col-md-6 " style="margin-left:24%;margin-right:24%;">
diff --git a/resources/views/footer.blade.php b/resources/views/footer.blade.php
index 26afb4f..adda984 100755
--- a/resources/views/footer.blade.php
+++ b/resources/views/footer.blade.php
@@ -16,45 +16,45 @@
 </section>
 
 <!-- Placed js at the end of the document so the pages load faster -->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/jquery-1.10.2.min.js"></script>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/jquery-migrate.js"></script>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/bootstrap.min.js"></script>
+<script src="{{ Request::secure(Request::root()).'js/jquery-1.10.2.min.js' }}"></script>
+<script src="{{ Request::secure(Request::root()).'js/jquery-migrate.js' }}"></script>
+<script src="{{ Request::secure(Request::root()).'js/bootstrap.min.js' }}"></script>
 <!--notification pan-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/modernizr.min.js"></script>
+<script src="{{ Request::secure(Request::root()).'js/modernizr.min.js' }}"></script>
 
 <!--Nice Scroll-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/jquery.nicescroll.js" type="text/javascript"></script>
+<script src="{{ Request::secure(Request::root()).'js/jquery.nicescroll.js' }}" type="text/javascript"></script>
 
 <!--right slidebar-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/slidebars.min.js"></script>
+<script src="{{ Request::secure(Request::root()).'js/slidebars.min.js' }}"></script>
 
 <!--switchery-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/switchery/switchery.min.js"></script>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/switchery/switchery-init.js"></script>
+<script src="{{ Request::secure(Request::root()).'js/switchery/switchery.min.js' }}"></script>
+<script src="{{ Request::secure(Request::root()).'js/switchery/switchery-init.js' }}"></script>
 
 <!--Sparkline Chart-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/sparkline/jquery.sparkline.js"></script>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/sparkline/sparkline-init.js"></script>
+<script src="{{ Request::secure(Request::root()).'js/sparkline/jquery.sparkline.js' }}"></script>
+<script src="{{ Request::secure(Request::root()).'js/sparkline/sparkline-init.js' }}"></script>
 
 <!--Form Validation-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/bootstrap-validator.min.js" type="text/javascript"></script>
+<script src="{{ Request::secure(Request::root()).'js/bootstrap-validator.min.js' }}" type="text/javascript"></script>
 
 <!--Form Wizard-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/jquery.steps.min.js" type="text/javascript"></script>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/jquery.validate.min.js" type="text/javascript"></script>
+<script src="{{ Request::secure(Request::root()).'js/jquery.steps.min.js' }}" type="text/javascript"></script>
+<script src="{{ Request::secure(Request::root()).'js/jquery.validate.min.js' }}" type="text/javascript"></script>
 
 <!--wizard initialization-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/wizard-init.js" type="text/javascript"></script>
+<script src="{{ Request::secure(Request::root()).'js/wizard-init.js'}}" type="text/javascript"></script>
 
 
 <!--common scripts for all pages-->
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/scripts.js"></script>
+<script src="{{ Request::secure(Request::root()).'js/scripts.js' }}"></script>
 <!-- Ace Editor -->
 @if(\Request::path() != 'console')
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/ace/ace.js" type="text/javascript" ></script>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/ace/theme-github.js" type="text/javascript" ></script>
-<script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/ace/mode-php.js" type="text/javascript" ></script>
-<script src="js/ace/jquery-ace.min.js" type="text/javascript" ></script>
+<script src="{{ Request::secure(Request::root()).'js/ace/ace.js' }}" type="text/javascript" ></script>
+<script src="{{ Request::secure(Request::root()).'js/ace/theme-github.js' }}" type="text/javascript" ></script>
+<script src="{{ Request::secure(Request::root()).'js/ace/mode-php.js' }}" type="text/javascript" ></script>
+<script src="{{ Request::secure(Request::root()).'js/ace/jquery-ace.min.js' }}" type="text/javascript" ></script>
 @endif
 @include('notifier')
 </body>
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index f17d3c0..0722f3f 100755
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -6,29 +6,27 @@
     <meta name="description" content="Devless is a backend as a service framework that provide developers an easier way to rollout their web and mobile platform ">
     <meta name="author" content="Devless">
     <meta name="keyword" content="Devless, opensource, BAAS, Backend as a service, robust, php, laravel ">
-
-    <link rel="shortcut icon" href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>favicon.ico" type="image/x-icon">
-    <link rel="icon" href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="javascript:;" type="image/png">
 
     <title>Devless 1.1.2 </title>
 
     <!--right slidebar-->
-    <link href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>css/slidebars.css" rel="stylesheet">
+    <link href="{{ Request::secure(Request::root()).'css/slidebars.css' }}" rel="stylesheet">
 
     <!--switchery-->
-    <link href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/switchery/switchery.min.css" rel="stylesheet" type="text/css" media="screen" />
+    <link href="{{ Request::secure(Request::root()).'js/switchery/switchery.min.css'}}" rel="stylesheet" type="textcss" media="screen" />
 
     <!--Form Wizard-->
-    <link rel="stylesheet" type="text/css" href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>css/jquery.steps.css" />
+    <link rel="stylesheet" type="textcss" href="{{ Request::secure(Request::root()).'css/jquery.steps.css' }}" />
 
     <!--common style-->
-    <link href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>css/style.css" rel="stylesheet">
-    <link href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>css/style-responsive.css" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>css/custom.css">
+    <link href="{{ Request::secure(Request::root()).'css/style.css' }}" rel="stylesheet">
+    <link href="{{ Request::secure(Request::root()).'css/style-responsive.css' }}" rel="stylesheet">
+    <link rel="stylesheet" type="textcss" href="{{ Request::secure(Request::root()).'css/custom.css'}}">
     @if( \Request::path() == 'privacy' || \Request::path() == 'datatable' || \Request::path() == 'services')
-      <link rel="stylesheet" href="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>css/helper.css" media="screen" title="no title" charset="utf-8">
-      <script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/jquery-1.10.2.min.js"></script>
-      <script src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>js/bootstrap.min.js"></script>
+      <link rel="stylesheet" href="{{ Request::secure(Request::root()).'css/helper.css' }}" media="screen" title="no title" charset="utf-8">
+      <script src="{{ Request::secure(Request::root()).'js/jquery-1.10.2.min.js' }}"></script>
+      <script src="{{ Request::secure(Request::root()).'js/bootstrap.min.js' }}"></script>
     @endif
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/resources/views/hub/index.blade.php b/resources/views/hub/index.blade.php
index 20b5e81..6cea35b 100755
--- a/resources/views/hub/index.blade.php
+++ b/resources/views/hub/index.blade.php
@@ -5,7 +5,7 @@
 <div class="page-head">
     <h3>Hub</h3>
     <span class="sub-title">Hub/</span>
-    <form method="post" action="#" class="search-content">
+    <form method="post" action="index.html" class="search-content">
         <input type="text" placeholder="Search module or service..." name="keyword" class="form-control">
     </form>
 </div>
@@ -26,14 +26,13 @@
             <div class="name column-name">
               <h3>
                 <a href="#" data-toggle="modal" data-target="#service-desc">
-                    <!--src="{{$service['image_url']}}"-->
+                    <!--src="{{$service['image_url']}}"--> 
                     {{$service['name']}}<img width=2 class="plugin-icon img-responsive" src="{{$service['image_url']}}" alt="N/A">
                 </a>
               </h3>
             </div>
             <div class="desc column-description">
               <p>{{$service['description']}} </p>
-              <!--<a href="#" data-toggle="modal" data-target="#service-desc">More Details</a>-->
             </div>
           </div>
           <div class="plugin-card-bottom">
@@ -45,12 +44,12 @@
               <p class="authors"><cite>By <a href="#">{{$service['author']}}</a></cite></p>
             </div>
           </div>
-        </div>
+        </div>  
       </div>
             @endforeach
-
+       
     @else
-       <h3 class="text-center alert alert-info">Sorry Services could not be fetched !</h3>
+       <h3 class="text-center alert alert-info">Sorry Services could not be fetched !</h3> 
             @endif
     </div>
 </div><!--body wrapper end-->
@@ -70,28 +69,28 @@ function install(url, service_name) {
                       setTimeout(function  () {
                           $('#notif').modal('hide');
                       },3000)
-
+                      
                        $('#'+service_name).html('Installed').closest('button').attr('disabled', 'true');
                    }
                })
            }
            function httpGetAsync(theUrl, callback){
 {               var xmlHttp = new XMLHttpRequest();
-                xmlHttp.onreadystatechange = function() {
+                xmlHttp.onreadystatechange = function() { 
                     if (xmlHttp.readyState == 4 && xmlHttp.status == 200)
                         callback(xmlHttp.responseText);
                 }
-                xmlHttp.open("GET", theUrl, true); // true for asynchronous
+                xmlHttp.open("GET", theUrl, true); // true for asynchronous 
                 xmlHttp.send(null);
 }           }
 </script>
 
 
-<div class="modal fade" id="notif" tabindex="-1" role="dialog"
+<div class="modal fade" id="notif" tabindex="-1" role="dialog" 
    aria-labelledby="myModalLabel" aria-hidden="true" >
    <div class="modal-dialog" style="width:250px;height:3%;">
       <div class="modal-content" style="background-color:#7BE454;">
-
+        
          <div class="modal-body">
             <div id="left">
       <div>
@@ -100,12 +99,14 @@ function httpGetAsync(theUrl, callback){
             Check services menu <br>
            If service not installed, Please Try again.</font></p>
     </center>
-
+   
          </div>
-
+        
       </div><!-- /.modal-content -->
    </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 </div>
 </div>
 @endsection
+
+
diff --git a/resources/views/services/edit.blade.php b/resources/views/services/edit.blade.php
index 730bcb9..2389d2a 100755
--- a/resources/views/services/edit.blade.php
+++ b/resources/views/services/edit.blade.php
@@ -1,474 +1,474 @@
 @extends('layout')
 
 @section('header')
-   <!-- page head start-->
-            <div class="page-head">
-                <h3>Service</h3><span class="sub-title">{{ucwords($service->name)}}</span>            </div><!-- page head end-->
-@endsection
-
-@section('content')
-    @include('error')
-<div id="schema-table" class="modal fade" role="dialog">
-  <div class="modal-dialog">
-
-    <!-- Modal content-->
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal">&times;</button>
-        <h4 class="modal-title">Add Tables</h4>
-      </div>
-      <div class="modal-body">
+<!-- page head start-->
+<div class="page-head">
+  <h3>Service</h3><span class="sub-title">{{ucwords($service->name)}}</span>            </div><!-- page head end-->
+  @endsection
+
+  @section('content')
+  @include('error')
+  <div id="schema-table" class="modal fade" role="dialog">
+    <div class="modal-dialog">
+
+      <!-- Modal content-->
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal">&times;</button>
+          <h4 class="modal-title">Add Tables</h4>
+        </div>
+        <div class="modal-body">
           <form id="form">
-         <div  class="form-group">
+           <div  class="form-group">
             <label for="name-field">Table Name</label>
             <input type="text" id="name" name="name" class="form-control" placeholder="Table Name"/>
-        </div>
-        <div class="form-group">
+          </div>
+          <div class="form-group">
             <label for="description">Description</label>
-                <textarea class="form-control" id="description" rows="3" name="description"></textarea>
-        </div>
+            <textarea class="form-control" id="description" rows="3" name="description"></textarea>
+          </div>
           <HR>
-          <center> Add Fields </center>
-
-          <div class="removeIndicator" id="fields" >
-            <div  class="form-group">
-            <label for="name-field">Field Name</label>
-            <button type="button" class="btn btn-danger pull-right" id="delete-field" onclick="destroy_field('removeIndicator')">Remove</button>
-            <input type="text" id="field-name"  name="field-name" class="form-control" placeholder="Field Name"/>
+            <center> Add Fields </center>
+
+            <div class="removeIndicator" id="fields" >
+              <div  class="form-group">
+                <label for="name-field">Field Name</label>
+                <button type="button" class="btn btn-danger pull-right" id="delete-field" onclick="destroy_field('removeIndicator')">Remove</button>
+                <input type="text" id="field-name"  name="field-name" class="form-control" placeholder="Field Name"/>
+              </div>
+              <div  class="form-group">
+                <label for="field-type">Field Type</label>
+
+                <?php /*'REFERENCE'*/$options = ['TEXT','TEXTAREA','INTEGER','DECIMALS','PASSWORD','URL','EMAIL', 'BASE64', 'REFERENCE'] ?>
+                <select class="form-control"  name="field-type" id="field-type">
+                  @foreach($options as  $option)
+                  <option value="{{$option}}">{{$option}}</option>
+                  @endforeach
+                </select>
+              </div>
+              <div  class="form-group">
+                <div style="display:block;" >
+                  <label for="field-reference">Reference Table</label>
+                  <select class="form-control"  name="field-reference" id="field-reference" >
+                    @foreach($table_meta as $table_data)
+                    <option value="{{$table_data['name']}}">{{$table_data['name']}}</option>
+                    @endforeach
+                    <option value="______________devless_users">DevLess User</option>
+                  </select>
+                </div>
+              </div>
+              <div class="form-group">
+               <label for="default-field">Default Value(optional)</label>
+               <input type="text" id="default" name="default" class="form-control" />
              </div>
-           <div  class="form-group">
-            <label for="field-type">Field Type</label>
-
-            <?php /*'REFERENCE'*/$options = ['TEXT','TEXTAREA','INTEGER','DECIMALS','PASSWORD','URL','EMAIL', 'BASE64', 'REFERENCE'] ?>
-            <select class="form-control"  name="field-type" id="field-type">
-                @foreach($options as  $option)
-                <option value="{{$option}}">{{$option}}</option>
-                @endforeach
-            </select>
-        </div>
-        <div  class="form-group">
-            <div style="display:block;" >
-            <label for="field-reference">Reference Table</label>
-            <select class="form-control"  name="field-reference" id="field-reference" >
-                @foreach($table_meta as $table_data)
-                <option value="{{$table_data['name']}}">{{$table_data['name']}}</option>
-                @endforeach
-                <option value="______________devless_users">DevLess User</option>
-            </select>
-            </div>
-        </div>
-          <div class="form-group">
-           <label for="default-field">Default Value(optional)</label>
-            <input type="text" id="default" name="default" class="form-control" />
-           </div>
 
              <div class="form-group">
-                <label for="option-field">Field Options</label>
+              <label for="option-field">Field Options</label>
 
-                  <input type="checkbox" id="required"  name="required"/>REQUIRED?
+              <input type="checkbox" id="required"  name="required"/>REQUIRED?
 
 
-                 <div style="display:none;">
-                     <input type="checkbox" id="validate" name="validate"/>VALIDATE?
-                 </div>
+              <div style="display:none;">
+               <input type="checkbox" id="validate" name="validate"/>VALIDATE?
+             </div>
 
 
-                    <input type="checkbox" id="unique" name="unique"/> UNIQUE FIELD?
-            </div>
-      </div>
-              <div class="dynamic-space"></div>
+             <input type="checkbox" id="unique" name="unique"/> UNIQUE FIELD?
+           </div>
+         </div>
+         <div class="dynamic-space"></div>
 
-      <div class="modal-footer">
+         <div class="modal-footer">
           <button type="button" onclick="append_field()" class="btn btn-info pull-left" >Add a Field</button>
           <button type="button" id="crt-tbl" onclick="create_table('{{$service->name}}')" class="btn btn-info pull-right" >Create Table</button>
-      </div>
+        </div>
       </div></form></div>
+    </div>
   </div>
-</div>
-            <!--body wrapper start-->
-            <div class="wrapper no-pad">
-                <div class="profile-desk">
-                    <aside class="p-short-info">
-                        <div class="widget">
-                            <div class="title">
-                                <h1>Service Details</h1>
-                            </div>
-                            <form action="{{ route('services.update', $service->id) }}" method="POST">
-                                <input type="hidden" name="_method" value="PUT">
-                                <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                                <div  class="form-group @if($errors->has('name')) has-error @endif">
-                                    <label for="name-field">Name</label>
-                                    <input type="text" readonly id="name-field" name="name" class="form-control" value="{{ $service->name }}"/>
-                                     @if($errors->has("name"))
-                                        <span class="help-block">{{ $errors->first("name") }}</span>
-                                     @endif
-                                </div>
-                                 <div  class="form-group @if($errors->has('active')) has-error @endif">
-                                    <label for="active-field">State</label>
-                                    <?php $options = ['Inactive','Active'] ?>
-                                    <select class="form-control"  name="active" id="active-field">
-                                        @foreach($options as $option_index => $option)
-                                        <option @if($service->active == $option_index )selected @endif value="{{$option_index}}">{{$option}}</option>
-                                        @endforeach
-                                    </select>
-                                     @if($errors->has("active"))
-                                        <span class="help-block">{{ $errors->first("active") }}</span>
-                                     @endif
-                                </div>
-
-
-                                <div class="form-group">
-                                    <label for="description-field">Description</label>
-                                    <div class="">
-                                        <textarea class="form-control" id="description-field" rows="3" name="description">{{ $service->description }}</textarea>
-                                        @if($errors->has("description"))
-                                        <span class="help-block">{{ $errors->first("description") }}</span>
-                                        @endif
-                                    </div>
-                                </div>
-                        </div>
-                    </aside>
-                    <aside class="p-aside">
-                        <section class="isolate-tabs">
-                            <header class="panel-heading tab-dark ">
-                                <ul class="nav nav-tabs nav-justified">
-                                    <li class="active">
-                                        <a data-toggle="tab" href="#mtab">Tables</a>
-                                    </li>
-                                    <li class="">
-                                        <a data-toggle="tab" onclick="set_script()" href="#jtab">Rules</a>
-                                    </li>
-                                    <li class="">
-                                        <a data-toggle="tab" href="#jus">Remote DB Config</a>
-                                    </li>
-                                </ul>
-                            </header>
-
-                            <div class="panel-body">
-                                <div class="tab-content">
-                                    <div class="tab-pane" id="jus">
-                                        <form role="form">
-                                            <div class="form-group">
-                                                <label for="g-title">Name</label>
-                                                <input class="form-control" name="database" id="database"
-                                                placeholder="Database Name" value="{{$service->database}}" type="text">
-
-                                        @if($errors->has("database"))
-                                        <span class="help-block">{{ $errors->first("database") }}</span>
-                                        @endif
-                                         </div>
-
-                                            <div class="form-group">
-                                                <label for="g-txt" >Database Type</label>
-                                                <select id="db-type" name="driver"  class="form-control m-b-10">
-                                                    <?php $options = ['Default'=>'default','Sqlite'=>'sqlite',
-                                                        'MySql'=>'mysql','Postgres'=>'pgsql','SQL Server'=>'sqlsrv'];?>
-                                                    @foreach($options as $option_index => $option_value )
-                                                    <option value="{{$option_value}}" @if($option_value == $service->driver)selected @endif >{{$option_index}}</option>
-                                                    @endforeach
-                                                </select>
-                                                 @if($errors->has("driver"))
-                                                  <span class="help-block">{{ $errors->first("driver") }}</span>
-                                                @endif
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="g-txt">Host Name</label>
-                                                <input class="form-control" name="hostname" id="hostname"
-                                                       type="text" placeholder="127.0.0.1" value="{{$service->hostname}}">
-                                                 @if($errors->has("hostname"))
-                                                  <span class="help-block">{{ $errors->first("hostname") }}</span>
-                                                @endif
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="g-txt">Username</label>
-                                                <input class="form-control" name="username" id="username"
-                                                        type="text" placeholder="root" value="{{$service->username}}">
-                                                @if($errors->has("username"))
-                                                  <span class="help-block">{{ $errors->first("username") }}</span>
-                                                @endif
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="g-txt">Password</label>
-                                                <input class="form-control" id="password" name="password" placeholder="password" value="{{$service->password}}" type="password">
-                                                @if($errors->has("password"))
-                                                  <span class="help-block">{{ $errors->first("password") }}</span>
-                                                @endif
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="g-txt">Port</label>
-                                                <input class="form-control" id="port" name="port" placeholder="port" value="{{$service->port}}" type="port">
-                                                @if($errors->has("port"))
-                                                  <span class="help-block">{{ $errors->first("port") }}</span>
-                                                @endif
-                                            </div>
-                                            <button class="btn btn-info" type=
-                                            "submit">Update</button>
-                                        </form>
-                                    </div>
-                                    <div class="tab-pane active " id="mtab">
-                                                <section class="panel">
+  <!--body wrapper start-->
+  <div class="wrapper no-pad">
+    <div class="profile-desk">
+      <aside class="p-short-info">
+        <div class="widget">
+          <div class="title">
+            <h1>Service Details</h1>
+          </div>
+          <form action="{{ route('services.update', $service->id) }}" method="POST">
+            <input type="hidden" name="_method" value="PUT">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <div  class="form-group @if($errors->has('name')) has-error @endif">
+              <label for="name-field">Name</label>
+              <input type="text" readonly id="name-field" name="name" class="form-control" value="{{ $service->name }}"/>
+              @if($errors->has("name"))
+              <span class="help-block">{{ $errors->first("name") }}</span>
+              @endif
+            </div>
+            <div  class="form-group @if($errors->has('active')) has-error @endif">
+              <label for="active-field">State</label>
+              <?php $options = ['Inactive','Active'] ?>
+              <select class="form-control"  name="active" id="active-field">
+                @foreach($options as $option_index => $option)
+                <option @if($service->active == $option_index )selected @endif value="{{$option_index}}">{{$option}}</option>
+                @endforeach
+              </select>
+              @if($errors->has("active"))
+              <span class="help-block">{{ $errors->first("active") }}</span>
+              @endif
+            </div>
+
+
+            <div class="form-group">
+              <label for="description-field">Description</label>
+              <div class="">
+                <textarea class="form-control" id="description-field" rows="3" name="description">{{ $service->description }}</textarea>
+                @if($errors->has("description"))
+                <span class="help-block">{{ $errors->first("description") }}</span>
+                @endif
+              </div>
+            </div>
+          </div>
+        </aside>
+        <aside class="p-aside">
+          <section class="isolate-tabs">
+            <header class="panel-heading tab-dark ">
+              <ul class="nav nav-tabs nav-justified">
+                <li class="active">
+                  <a data-toggle="tab" href="#mtab">Tables</a>
+                </li>
+                <li class="">
+                  <a data-toggle="tab" onclick="set_script()" href="#jtab">Rules</a>
+                </li>
+                <li class="">
+                  <a data-toggle="tab" href="#jus">Remote DB Config</a>
+                </li>
+              </ul>
+            </header>
+
+            <div class="panel-body">
+              <div class="tab-content">
+                <div class="tab-pane" id="jus">
+                  <form role="form">
+                    <div class="form-group">
+                      <label for="g-title">Name</label>
+                      <input class="form-control" name="database" id="database"
+                      placeholder="Database Name" value="{{$service->database}}" type="text">
+
+                      @if($errors->has("database"))
+                      <span class="help-block">{{ $errors->first("database") }}</span>
+                      @endif
+                    </div>
+
+                    <div class="form-group">
+                      <label for="g-txt" >Database Type</label>
+                      <select id="db-type" name="driver"  class="form-control m-b-10">
+                        <?php $options = ['Default'=>'default','Sqlite'=>'sqlite',
+                        'MySql'=>'mysql','Postgres'=>'pgsql','SQL Server'=>'sqlsrv'];?>
+                        @foreach($options as $option_index => $option_value )
+                        <option value="{{$option_value}}" @if($option_value == $service->driver)selected @endif >{{$option_index}}</option>
+                        @endforeach
+                      </select>
+                      @if($errors->has("driver"))
+                      <span class="help-block">{{ $errors->first("driver") }}</span>
+                      @endif
+                    </div>
+                    <div class="form-group">
+                      <label for="g-txt">Host Name</label>
+                      <input class="form-control" name="hostname" id="hostname"
+                      type="text" placeholder="127.0.0.1" value="{{$service->hostname}}">
+                      @if($errors->has("hostname"))
+                      <span class="help-block">{{ $errors->first("hostname") }}</span>
+                      @endif
+                    </div>
+                    <div class="form-group">
+                      <label for="g-txt">Username</label>
+                      <input class="form-control" name="username" id="username"
+                      type="text" placeholder="root" value="{{$service->username}}">
+                      @if($errors->has("username"))
+                      <span class="help-block">{{ $errors->first("username") }}</span>
+                      @endif
+                    </div>
+                    <div class="form-group">
+                      <label for="g-txt">Password</label>
+                      <input class="form-control" id="password" name="password" placeholder="password" value="{{$service->password}}" type="password">
+                      @if($errors->has("password"))
+                      <span class="help-block">{{ $errors->first("password") }}</span>
+                      @endif
+                    </div>
+                    <div class="form-group">
+                      <label for="g-txt">Port</label>
+                      <input class="form-control" id="port" name="port" placeholder="port" value="{{$service->port}}" type="port">
+                      @if($errors->has("port"))
+                      <span class="help-block">{{ $errors->first("port") }}</span>
+                      @endif
+                    </div>
+                    <button class="btn btn-info" type=
+                    "submit">Update</button>
+                  </form>
+                </div>
+                <div class="tab-pane active " id="mtab">
+                  <section class="panel">
                     <header class="panel-heading head-border">
 
                     </header>
                     <div class="table-responsive">
-                        <table class="table">
-                            <thead>
-                                 @if(sizeOf($table_meta) > 0)
-                                <tr>
-                                    <th>#</th>
-                                    <th>Table Name</th>
-                                    <th>Description</th>
-                                    <th>#N0 of Fields</th>
-
-                                    <th>Options</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                    <?php $count = 0; ?>
-                                    @foreach($table_meta as $table_data)
-                                <tr id="{{$table_data['name']}}">
-                                    <th scope="row">{{$count}}</th>
-                                    <td>{{$table_data['name']}}</td>
-                                    <td>{{$table_data['description']}}</td>
-                                    <td>{{sizeOf($table_data['field'])}} field(s)</td>
-                                    <td><a href="/datatable?service_name={{$service->name}}&table_name={{$table_data['name']}}" class="btn btn-default">View Data</a>
-                                        <button onclick="destroy_table('{{$table_data['name']}}','{{$service->name}}')" class="btn btn-danger btn-sm">Delete Table</button></td>
-                                </tr>
-                                    <?php $count++; ?>
-                                    @endforeach
-                                 @else
-                                <h3 class="text-center alert alert-info">Empty!</h3>
-                                @endif
-                            </tbody>
-                        </table>
-                        <br>
-                        <button type="button" class="btn btn-info " data-toggle="modal" data-target="#schema-table">New Table</button>
+                      <table class="table">
+                        <thead>
+                         @if(sizeOf($table_meta) > 0)
+                         <tr>
+                          <th>#</th>
+                          <th>Table Name</th>
+                          <th>Description</th>
+                          <th>#N0 of Fields</th>
+
+                          <th>Options</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <?php $count = 0; ?>
+                        @foreach($table_meta as $table_data)
+                        <tr id="{{$table_data['name']}}">
+                          <th scope="row">{{$count}}</th>
+                          <td>{{$table_data['name']}}</td>
+                          <td>{{$table_data['description']}}</td>
+                          <td>{{sizeOf($table_data['field'])}} field(s)</td>
+                          <td><a href="/datatable?service_name={{$service->name}}&table_name={{$table_data['name']}}" class="btn btn-default">View Data</a>
+                            <button onclick="destroy_table('{{$table_data['name']}}','{{$service->name}}')" class="btn btn-danger btn-sm">Delete Table</button></td>
+                          </tr>
+                          <?php $count++; ?>
+                          @endforeach
+                          @else
+                          <h3 class="text-center alert alert-info">Empty!</h3>
+                          @endif
+                        </tbody>
+                      </table>
+                      <br>
+                      <button type="button" class="btn btn-info " data-toggle="modal" data-target="#schema-table">New Table</button>
                     </div>
-                </section>
-                                    </div>
-                                                                   <div class="tab-pane" id="jtab">
-
-
-<textarea class="code-box" name="script" rows="20" style="width: 100%">
-{{$service->script}}
-</textarea>
-                                                                       <br>
-
-                                                                       <button class="btn btn-info " onclick="run_script()" type="button"> Save </button><br><br>
-<span id="code-console" class="code-console" style="background-color:black;margin-left:14%;width:400px;height:300px;color:greenyellow">
-   </span>
-                                    </div>
-                                </div>
-                            </div>
-                        </section>
-                    </aside>
+                  </section>
                 </div>
-            </div><!--body wrapper end-->
-<!--body wrapper end-->
-<script>
+                <div class="tab-pane" id="jtab">
+
+
+                  <textarea class="code-box" name="script" rows="20" style="width: 100%">
+                    {{$service->script}}
+                  </textarea>
+                  <br>
+
+                  <button class="btn btn-info " onclick="run_script()" type="button"> Save </button><br><br>
+                  <span id="code-console" class="code-console" style="background-color:black;margin-left:14%;width:400px;height:300px;color:greenyellow">
+                  </span>
+                </div>
+              </div>
+            </div>
+          </section>
+        </aside>
+      </div>
+    </div><!--body wrapper end-->
+    <!--body wrapper end-->
+    <script>
     //page init function
     function init(){
-        window.count = 0;
-        window.main_old_fields =  $('.removeIndicator').clone();
-        window.schema_json = {"resource":[{"name":"","description":"","field":[]}]  }
+      window.count = 0;
+      window.main_old_fields =  $('.removeIndicator').clone();
+      window.schema_json = {"resource":[{"name":"","description":"","field":[]}]  }
     }
     //destroy table
     function destroy_table(table_name, service_name){
-        if(confirm('Are you sure you want to delete '+table_name+' table?')){
-            var settings = {
-           "async": true,
-           "crossDomain": true,
-           "url": "/api/v1/service/"+service_name+"/db",
-           "method": "DELETE",
-           "headers": {
-             "content-type": "application/json",
-             "cache-control": "no-cache",
-           },
-           "processData": false,
-            "data": "{\"resource\":[{\"name\":\""+table_name+"\",\"params\":[{\"drop\":\"true\"}]}]}"
-           }
-         $.ajax(settings).done(function (response) {
-             console.log(response)
+      if(confirm('Are you sure you want to delete '+table_name+' table?')){
+        var settings = {
+         "async": true,
+         "crossDomain": true,
+         "url": "/api/v1/service/"+service_name+"/db",
+         "method": "DELETE",
+         "headers": {
+           "content-type": "application/json",
+           "cache-control": "no-cache",
+         },
+         "processData": false,
+         "data": "{\"resource\":[{\"name\":\""+table_name+"\",\"params\":[{\"drop\":\"true\"}]}]}"
+       }
+       $.ajax(settings).done(function (response) {
+         console.log(response)
            //response_object = JSON.parse(response);
            status_code = response.status_code;
            if (status_code == 613) {
-                $("#"+table_name).remove();
-           }
-           else
-           {
-               alert('could not delete table ');
-           }
-         });}
-    }
-  function append_field(){
-    field_names = ['name', 'description', 'field-name', 'field-type', 'field-reference',
-                'default','required', 'validate', 'unique'];
-    old_fields = window.main_old_fields.clone();
-          field_names.forEach(
-    function(i){
-              field_name = i+window.count;
-              old_fields.find('#'+i).attr('name', field_name ).attr('id', field_name );
+            $("#"+table_name).remove();
+          }
+          else
+          {
+           alert('could not delete table ');
          }
-    )
-    new_fields = old_fields;
-    $( ".dynamic-space").append(new_fields);
-    old_fields.attr('class', 'fields'+window.count);
-    old_fields.contents().each(function () {
+       });}
+     }
+     function append_field(){
+      field_names = ['name', 'description', 'field-name', 'field-type', 'field-reference',
+      'default','required', 'validate', 'unique'];
+      old_fields = window.main_old_fields.clone();
+      field_names.forEach(
+        function(i){
+          field_name = i+window.count;
+          old_fields.find('#'+i).attr('name', field_name ).attr('id', field_name );
+        }
+        )
+      new_fields = old_fields;
+      $( ".dynamic-space").append(new_fields);
+      old_fields.attr('class', 'fields'+window.count);
+      old_fields.contents().each(function () {
         if (this.nodeType === 3) this.nodeValue = $.trim($(this).text()).replace(/removeIndicator/g, "fields"+window.count)
-        if (this.nodeType === 1) $(this).html( $(this).html().replace(/removeIndicator/g, "fields"+window.count) )
+          if (this.nodeType === 1) $(this).html( $(this).html().replace(/removeIndicator/g, "fields"+window.count) )
         })
-    window.count = window.count + 1 ;
+      window.count = window.count + 1 ;
 
     }
 
     function create_table(service_name){
-         $('#crt-tbl').prop('disabled', true);
-         $.fn.serializeObject = function()
+     $('#crt-tbl').prop('disabled', true);
+     $.fn.serializeObject = function()
+     {
+      var o = {};
+      var a = this.serializeArray();
+      $.each(a, function() {
+        if (o[this.name] !== undefined) {
+          if (!o[this.name].push) {
+            o[this.name] = [o[this.name]];
+          }
+          o[this.name].push(this.value || '');
+        } else {
+          o[this.name] = this.value || '';
+        }
+      });
+      return o;
+    };
+    object = $('#form').serializeObject();
+    var array = $.map(object, function(value, index) {
+      return [value];
+    });
+    count = 0
+    jQuery(
+      function($)
+      {
+        count = 0 ;
+        form_array = [];
+        $.each($('#form')[0].elements,
+         function(i,o)
+         {
+          var _this=$(o);
+          field_id = _this.attr('id');
+          if(typeof field_id == "string" && field_id.indexOf("validate")>= 0){
+           form_array[count] = $('#'+_this.attr('id')).is(':checked');
+         }
+         else if(typeof field_id == "string" && field_id.indexOf("required")>= 0){
+           form_array[count] = $('#'+_this.attr('id')).is(':checked');
+         }
+         else if(typeof field_id == "string" && field_id.indexOf("unique")>= 0){
+           form_array[count] = $('#'+_this.attr('id')).is(':checked');
+         }else{
+           form_array[count] = $('#'+_this.attr('id')).val();
+         }
+         count++;
+       })
+      }
+      );
+    if(form_array.length > 4){
+      function trim(str){
+        console.log(str);
+        if(typeof str == "string"){
+
+          return str.replace(/\s+/g, '').toLowerCase();
+        }else{
+          return str;
+        }
+      }
+      window.schema_json.resource[0].name = trim(form_array[0]);
+      window.schema_json.resource[0].description = form_array[1]  ;
+      var len = ((form_array.length)-4)/8;
+
+      for (var i = 1; i <= len; i++) {
+        position = ((len-i)*8)
+        if(form_array[6+position] == ""){ _default = null;}else{_default = form_array[6+position]; }
+        console.log("field tpe", trim(form_array[4+position]));
+        if(trim(form_array[4+position]) == "reference")
         {
-            var o = {};
-            var a = this.serializeArray();
-            $.each(a, function() {
-                if (o[this.name] !== undefined) {
-                    if (!o[this.name].push) {
-                        o[this.name] = [o[this.name]];
-                    }
-                    o[this.name].push(this.value || '');
-                } else {
-                    o[this.name] = this.value || '';
-                }
-            });
-            return o;
+          console.log('appended service')
+          referenced_table_name = service_name+'_'+trim(form_array[5+position])+'_id';
+
+        }else{
+          referenced_table_name = trim(form_array[3+position]);
+          console.log('went for else instead')
+        }
+        console.log('ref after passing', referenced_table_name);
+        window.schema_json.resource[0].field[i-1] = {
+          "name":    referenced_table_name,
+          "field_type":trim(form_array[4+position]),
+          "ref_table":trim(form_array[5+position]),
+          "default":_default,
+          "required":trim(form_array[7+position]),
+          "validation":trim(form_array[8+position]),
+          "is_unique":trim(form_array[9+position]),
         };
-        object = $('#form').serializeObject();
-        var array = $.map(object, function(value, index) {
-        return [value];
-        });
-        count = 0
-        jQuery(
-            function($)
-            {
-              count = 0 ;
-              form_array = [];
-              $.each($('#form')[0].elements,
-                     function(i,o)
-                     {
-                      var _this=$(o);
-                      field_id = _this.attr('id');
-                       if(typeof field_id == "string" && field_id.indexOf("validate")>= 0){
-                           form_array[count] = $('#'+_this.attr('id')).is(':checked');
-                       }
-                       else if(typeof field_id == "string" && field_id.indexOf("required")>= 0){
-                           form_array[count] = $('#'+_this.attr('id')).is(':checked');
-                       }
-                       else if(typeof field_id == "string" && field_id.indexOf("unique")>= 0){
-                           form_array[count] = $('#'+_this.attr('id')).is(':checked');
-                       }else{
-                           form_array[count] = $('#'+_this.attr('id')).val();
-                       }
-                    count++;
-                     })
-            }
-          );
-            if(form_array.length > 4){
-                function trim(str){
-                    console.log(str);
-                    if(typeof str == "string"){
-
-                        return str.replace(/\s+/g, '').toLowerCase();
-                    }else{
-                        return str;
-                    }
-                }
-                window.schema_json.resource[0].name = trim(form_array[0]);
-                window.schema_json.resource[0].description = form_array[1]  ;
-                var len = ((form_array.length)-4)/8;
-
-                for (var i = 1; i <= len; i++) {
-                    position = ((len-i)*8)
-                    if(form_array[6+position] == ""){ _default = null;}else{_default = form_array[6+position]; }
-                    console.log("field tpe", trim(form_array[4+position]));
-                    if(trim(form_array[4+position]) == "reference")
-                    {
-                        console.log('appended service')
-                        referenced_table_name = service_name+'_'+trim(form_array[5+position])+'_id';
-
-                    }else{
-                        referenced_table_name = trim(form_array[3+position]);
-                        console.log('went for else instead')
-                    }
-                    console.log('ref after passing', referenced_table_name);
-                    window.schema_json.resource[0].field[i-1] = {
-                        "name":    referenced_table_name,
-                        "field_type":trim(form_array[4+position]),
-                        "ref_table":trim(form_array[5+position]),
-                        "default":_default,
-                        "required":trim(form_array[7+position]),
-                        "validation":trim(form_array[8+position]),
-                        "is_unique":trim(form_array[9+position]),
-                     };
-                }
-
-                if (len => 1) {
-                   table_schema =   JSON.stringify(window.schema_json);
-                   var settings = {
-                    "async": true,
-                    "crossDomain": true,
-                    "url": "/api/v1/service/"+service_name+"/schema",
-                    "method": "POST",
-                    "headers": {
-                      "content-type": "application/json",
-                      "cache-control": "no-cache",
-                    },
-                    "processData": false,
-                    "data": table_schema
-                  }
-                $.ajax(settings).done(function (response) {
-                  console.log(response);
-                  if(typeof(response) == "string")
-                  {
-                      response = JSON.parse(response);
-                  }
-                  var status_code = response.status_code;
-                  var message = response.message;
-                  var payload = response.payload;
-
-                  if(status_code == 700){
-                      console.log(message)
-                      alert(message);
-                      $('#crt-tbl').prop('disabled', false);
-                  }
-                  else if(status_code == 606){
-                        window.location.href = "/services/"+{{$service->id}}+"/edit";
-
-                  }else{
-                        alert(message);
-
-                  }
-                });} else {
-
-                     alert('Please add at least a field');
-                     $('#crt-tbl').prop('disabled', false);
-                }
-            }
-            else{
-                alert('Sorry seems like you have no fields set ');
-                $('#crt-tbl').prop('disabled', false);
-            }
+      }
+
+      if (len => 1) {
+       table_schema =   JSON.stringify(window.schema_json);
+       var settings = {
+        "async": true,
+        "crossDomain": true,
+        "url": "/api/v1/service/"+service_name+"/schema",
+        "method": "POST",
+        "headers": {
+          "content-type": "application/json",
+          "cache-control": "no-cache",
+        },
+        "processData": false,
+        "data": table_schema
+      }
+      $.ajax(settings).done(function (response) {
+        console.log(response);
+        if(typeof(response) == "string")
+        {
+          response = JSON.parse(response);
+        }
+        var status_code = response.status_code;
+        var message = response.message;
+        var payload = response.payload;
+
+        if(status_code == 700){
+          console.log(message)
+          alert(message);
+          $('#crt-tbl').prop('disabled', false);
+        }
+        else if(status_code == 606){
+          window.location.href = "/services/"+{{$service->id}}+"/edit";
+
+        }else{
+          alert(message);
+
+        }
+      });} else {
+
+       alert('Please add at least a field');
+       $('#crt-tbl').prop('disabled', false);
+     }
+   }
+   else{
+    alert('Sorry seems like you have no fields set ');
+    $('#crt-tbl').prop('disabled', false);
+  }
 
 
-    }
-   function destroy_field(field_id){
-       $('.'+field_id).remove();
-   }
-   function set_script(){
-       setTimeout(function(){ $('.code-box').ace({ theme: 'github', lang: 'php'}); }, 1);
-   }
-   function run_script(){
-       var form = new FormData();
-form.append("call_type", "solo");
-form.append("script", $('.code-box').val());
-form.append("_method", "PUT");
-var settings = {
+}
+function destroy_field(field_id){
+ $('.'+field_id).remove();
+}
+function set_script(){
+ setTimeout(function(){ $('.code-box').ace({ theme: 'github', lang: 'php'}); }, 1);
+}
+function run_script(){
+ var form = new FormData();
+ form.append("call_type", "solo");
+ form.append("script", $('.code-box').val());
+ form.append("_method", "PUT");
+ var settings = {
   "async": true,
   "crossDomain": true,
   "url": "{{ route('services.update', $service->id) }}",
@@ -484,10 +484,10 @@ function run_script(){
 $.ajax(settings).done(function (response) {
   result = JSON.parse(response);
   console.log(result);
-   (result.status_code == 626)?$('.code-console').css('color','greenyellow')
- : $('.code-console').css('color','red');
+  (result.status_code == 626)?$('.code-console').css('color','greenyellow')
+  : $('.code-console').css('color','red');
   $('.code-console').html('<font size="3">'+result.message+'</font>');
 });
-   }
+}
 </script>
 @endsection
diff --git a/resources/views/services/index.blade.php b/resources/views/services/index.blade.php
index 1015bef..b0d3382 100755
--- a/resources/views/services/index.blade.php
+++ b/resources/views/services/index.blade.php
@@ -3,7 +3,7 @@
 @section('header')
 <!-- page head start-->
 <div class="page-head">
-    <h3>Services</h3><span class="sub-title">Service/</span>
+  <h3>Services</h3><span class="sub-title">Service/</span>
 </div>
 <!-- page head end-->
 
@@ -13,81 +13,81 @@
 
 <!--body wrapper start-->
 <div class="wrapper">
-    <div class="row">
-         <div class="col-lg-3 col-sm-6 m-b-30">
-                <div class="panel panel-danger">
-                     <a href="{{ route('services.create') }}">
-                    <div class="panel-header"><br><h4><center>Create Service</center></h4></div>
-                    <div class="panel-body">
-
-                        <center><i class="fa fa-plus fa-5x" aria-hidden="true"></i></center>
-
-                        <br>
-
-
-                    </div>
-                    </a>
-                </div>
-
-            </div>
-        @if($services->count())
-             @foreach($services as $service)
-             <a href="{{ route('services.edit', $service->id) }}">
-            <div class="col-lg-3 col-sm-6 m-b-30">
-                <div class="panel panel-danger">
-                    <div class="panel-header"><br><h4><center>{{substr(strtoupper($service->name),0,10)}}</center></h4></div>
-                    <div class="panel-body" >
-                        <center><span title="{{$service->description}}"</span>{{substr($service->description, 0, 20)}}@if(strlen($service->description)>20)...@endif</center>
-                        <br><br>
-                        <center>
-
-                        <div class="btn-group" role="group">
-                            <a type="button" href="{{ route('services.edit', $service->id) }}" class="btn btn-default">Edit</a>
-                            <a type="button" href="/service/{{$service->name}}/view/index/" target="_blank" class="btn btn-default">Admin</a>
-                            <form action="{{ route('services.destroy', $service->id) }}" method="POST"
-                                  style="display: inline;"
-                                  onsubmit="if(confirm('Delete? Are you sure?')) { return true } else {return false }">
-                                <input type="hidden" name="_method" value="DELETE">
-                                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                                        <button type="submit" class="btn btn-default">Delete</button>
-                                    </form>
-
-                        </div>
-                        </center>
-
-                    </div>
-                </div>
-
-            </div>
-             </a>
-            @endforeach
-        {!! $services->render() !!}
-    @else
-       <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-           <div class="modal-dialog" role="document">
-               <div class="modal-content">
-                   <div class="modal-header">
-                       <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                       <h4 class="modal-title" id="myModalLabel">Quick Tutorial</h4>
-                   </div>
-                   <div class="modal-body text-center">
-                       You have no Services, lets walkthrough a quick tutorial on how to create a Service. Click on Getting Started to begin.
-                   </div>
-                   <div class="modal-footer">
-
-                       <a href="https://www.youtube.com/watch?v=vyNgmZ9zVOM" target="_blank" class="btn btn-primary">Getting Started</a>
-
-                   </div>
-               </div>
-           </div>
-       </div>
-       <script>
-           window.onload(function(){
-               $('#myModal').modal('show');
-           }());
-       </script>
-            @endif
+  <div class="row">
+   <div class="col-lg-3 col-sm-6 m-b-30">
+    <div class="panel panel-danger">
+     <a href="{{ route('services.create') }}">
+      <div class="panel-header"><br><h4><center>Create Service</center></h4></div>
+      <div class="panel-body">
+
+        <center><i class="fa fa-plus fa-5x" aria-hidden="true"></i></center>
+
+        <br>
+
+
+      </div>
+    </a>
+  </div>
+
+</div>
+@if($services->count())
+@foreach($services as $service)
+<a href="{{ route('services.edit', $service->id) }}">
+  <div class="col-lg-3 col-sm-6 m-b-30">
+    <div class="panel panel-danger">
+      <div class="panel-header"><br><h4><center>{{substr(strtoupper($service->name),0,10)}}</center></h4></div>
+      <div class="panel-body" >
+        <center><span title="{{$service->description}}"</span>{{substr($service->description, 0, 20)}}@if(strlen($service->description)>20)...@endif</center>
+        <br><br>
+        <center>
+
+          <div class="btn-group" role="group">
+            <a type="button" href="{{ route('services.edit', $service->id) }}" class="btn btn-default">Edit</a>
+            <a type="button" href="/service/{{$service->name}}/view/index/" target="_blank" class="btn btn-default">Admin</a>
+            <form action="{{ route('services.destroy', $service->id) }}" method="POST"
+              style="display: inline;"
+              onsubmit="if(confirm('Delete? Are you sure?')) { return true } else {return false }">
+              <input type="hidden" name="_method" value="DELETE">
+              <input type="hidden" name="_token" value="{{ csrf_token() }}">
+              <button type="submit" class="btn btn-default">Delete</button>
+            </form>
+
+          </div>
+        </center>
+
+      </div>
     </div>
+
+  </div>
+</a>
+@endforeach
+{!! $services->render() !!}
+@else
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+ <div class="modal-dialog" role="document">
+   <div class="modal-content">
+     <div class="modal-header">
+       <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+       <h4 class="modal-title" id="myModalLabel">Quick Tutorial</h4>
+     </div>
+     <div class="modal-body text-center">
+       You have no Services, lets walkthrough a quick tutorial on how to create a Service. Click on Getting Started to begin.
+     </div>
+     <div class="modal-footer">
+
+       <a href="https://www.youtube.com/watch?v=vyNgmZ9zVOM" target="_blank" class="btn btn-primary">Getting Started</a>
+
+     </div>
+   </div>
+ </div>
+</div>
+<script>
+ window.onload(function(){
+   $('#myModal').modal('show');
+ }());
+</script>
+@endif
+</div>
 </div><!--body wrapper end-->
 
 
diff --git a/resources/views/sidebar.blade.php b/resources/views/sidebar.blade.php
index 40f3645..4ef942b 100755
--- a/resources/views/sidebar.blade.php
+++ b/resources/views/sidebar.blade.php
@@ -5,7 +5,7 @@
                 <!--logo and logo icon start-->
                 <div class="logo dark-logo-bg hidden-xs hidden-sm">
                     <a href="/">
-                         <img src="<?= str_replace("index.php", "", $_SERVER["SCRIPT_NAME"]) ?>img/logo.png" alt="Devless">
+                         <img src="{{Request::secure(Request::root()).'img/logo.png'}}" alt="Devless">
                         <!--<i class="fa fa-maxcdn"></i>-->
                     </a>
                 </div>
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 93f1215..1465b56 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -20,34 +20,34 @@
 
         <table class="table">
             <thead>
-            <tr>
-                 <th>ID</th>
-                <th>User Name</th>
-                <th>First Name</th>
-                <th>Last Name</th>
-                <th>Phone Number</th>
-                <th>Email</th>
-            </tr>
-            </thead>
-            <tbody>
+                <tr>
+                   <th>ID</th>
+                   <th>User Name</th>
+                   <th>First Name</th>
+                   <th>Last Name</th>
+                   <th>Phone Number</th>
+                   <th>Email</th>
+               </tr>
+           </thead>
+           <tbody>
 
-             @if($users->count()> 1)
-                @foreach($users as $user)
-                    @if($user->id != 1)
-                        <tr>  
-                         <td>{{$user->id}}</td>
-                         <td>{{substr($user->username,0,10)}}</td>
-                         <td>{{substr($user->first_name,0,10)}}</td>
-                         <td>{{substr($user->last_name,0,10)}}</td>
-                         <td>{{substr($user->phone_number,0,10)}}</td>
-                         <td>{{substr($user->email,0,10)}}</td>
-                        </tr> 
-                    @endif
-                @endforeach
-             @endif       
+               @if($users->count()> 1)
+               @foreach($users as $user)
+               @if($user->id != 1)
+               <tr>  
+                   <td>{{$user->id}}</td>
+                   <td>{{substr($user->username,0,10)}}</td>
+                   <td>{{substr($user->first_name,0,10)}}</td>
+                   <td>{{substr($user->last_name,0,10)}}</td>
+                   <td>{{substr($user->phone_number,0,10)}}</td>
+                   <td>{{substr($user->email,0,10)}}</td>
+               </tr> 
+               @endif
+               @endforeach
+               @endif       
 
-            </tbody>
-        </table>
-    </section>
-                </div>
+           </tbody>
+       </table>
+   </section>
+</div>
 @endsection
\ No newline at end of file