diff --git a/src/CodeGenerator.php b/src/CodeGenerator.php
index 7637ebe7..aa82d063 100644
--- a/src/CodeGenerator.php
+++ b/src/CodeGenerator.php
@@ -168,7 +168,7 @@ public static function appendRoutes($config, $comm = null)
         $templateDirectory = __DIR__ . '/stubs';
         
         LAHelper::log("info", "Appending routes...", $comm);
-        if(\Dwij\Laraadmin\Helpers\LAHelper::laravel_ver() == 5.3) {
+        if(\Dwij\Laraadmin\Helpers\LAHelper::is_recent_laravel_version()) {
             $routesFile = base_path('routes/admin_routes.php');
         } else {
             $routesFile = app_path('Http/admin_routes.php');
diff --git a/src/Commands/LAInstall.php b/src/Commands/LAInstall.php
index f916a152..9c178bd6 100644
--- a/src/Commands/LAInstall.php
+++ b/src/Commands/LAInstall.php
@@ -6,16 +6,13 @@
  * Developed by: Dwij IT Solutions
  * Developer Website: http://dwijitsolutions.com
  */
-
 namespace Dwij\Laraadmin\Commands;
-
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 use Dwij\Laraadmin\Helpers\LAHelper;
 use Eloquent;
 use DB;
-
 /**
  * Class LAInstall
  * @package Dwij\Laraadmin\Commands
@@ -26,19 +23,19 @@ class LAInstall extends Command
 {
     // Model Names to be handled during Install
     var $modelsInstalled = ["User", "Role", "Permission", "Employee", "Department", "Upload", "Organization", "Backup"];
-    
+
     // The command signature.
     protected $signature = 'la:install';
-    
+
     // The command description.
     protected $description = 'Install LaraAdmin Package. Generate whole structure for /admin.';
-    
+
     // Copy From Folder - Package Install Files
     protected $from;
-    
+
     // Copy to Folder - Project Folder
     protected $to;
-    
+
     /**
      * Generates and Moves files to install LaraAdmin package.
      * At the end runs migrations and ask to create Super Admin in order to complete the installation.
@@ -49,40 +46,40 @@ public function handle()
     {
         try {
             $this->info('LaraAdmin installation started...');
-            
+
             $from = base_path('vendor/dwij/laraadmin/src/Installs');
             $to = base_path();
-            
+
             $this->info('from: ' . $from . " to: " . $to);
-            
+
             $this->line("\nDB Assistant:");
-            if($this->confirm("Want to set your Database config in the .env file ?", true)) {
+            if($this->confirm("Want to set your Database config in the .env file?", true)) {
                 $this->line("DB Assistant Initiated....");
                 $db_data = array();
-                
-                if(LAHelper::laravel_ver() == 5.3) {
+
+                if(LAHelper::is_recent_laravel_version()) {
                     $db_data['host'] = $this->ask('Database Host', '127.0.0.1');
                     $db_data['port'] = $this->ask('Database Port', '3306');
                 }
                 $db_data['db'] = $this->ask('Database Name', 'laraadmin1');
                 $db_data['dbuser'] = $this->ask('Database User', 'root');
                 $dbpass = $this->ask('Database Password', false);
-                
+
                 if($dbpass !== FALSE) {
                     $db_data['dbpass'] = $dbpass;
                 } else {
                     $db_data['dbpass'] = "";
                 }
-                
+
                 $default_db_conn = env('DB_CONNECTION', 'mysql');
-                
-                if(LAHelper::laravel_ver() == 5.3) {
+
+                if(LAHelper::is_recent_laravel_version()) {
                     config(['database.connections.' . $default_db_conn . '.host' => $db_data['host']]);
                     config(['database.connections.' . $default_db_conn . '.port' => $db_data['port']]);
                     LAHelper::setenv("DB_HOST", $db_data['host']);
                     LAHelper::setenv("DB_PORT", $db_data['port']);
                 }
-                
+
                 config(['database.connections.' . $default_db_conn . '.database' => $db_data['db']]);
                 config(['database.connections.' . $default_db_conn . '.username' => $db_data['dbuser']]);
                 config(['database.connections.' . $default_db_conn . '.password' => $db_data['dbpass']]);
@@ -90,24 +87,27 @@ public function handle()
                 LAHelper::setenv("DB_USERNAME", $db_data['dbuser']);
                 LAHelper::setenv("DB_PASSWORD", $db_data['dbpass']);
             }
-            
+
             if(env('CACHE_DRIVER') != "array") {
                 config(['cache.default' => 'array']);
                 LAHelper::setenv("CACHE_DRIVER", "array");
             }
-            
+            $mix_file = 'gulpfile.js';
+            if (LAHelper::laravel_ver() > 5.3) {
+                $mix_file = 'webpack.mix.js';
+            }
             if($this->confirm("This process may change/append to the following of your existing project files:"
                 . "\n\n\t app/Http/routes.php"
                 . "\n\t app/User.php"
                 . "\n\t database/migrations/2014_10_12_000000_create_users_table.php"
-                . "\n\t gulpfile.js"
+                . "\n\t $mix_file"
                 . "\n\n Please take backup or use git. Do you wish to continue ?", true)
             ) {
-                
+
                 // Controllers
                 $this->line("\n" . 'Generating Controllers...');
                 $this->copyFolder($from . "/app/Controllers/Auth", $to . "/app/Http/Controllers/Auth");
-                if(LAHelper::laravel_ver() == 5.3) {
+                if(LAHelper::is_recent_laravel_version()) {
                     // Delete Redundant Controllers
                     unlink($to . "/app/Http/Controllers/Auth/PasswordController.php");
                     unlink($to . "/app/Http/Controllers/Auth/AuthController.php");
@@ -118,23 +118,23 @@ public function handle()
                     unlink($to . "/app/Http/Controllers/Auth/ResetPasswordController.php");
                 }
                 $this->replaceFolder($from . "/app/Controllers/LA", $to . "/app/Http/Controllers/LA");
-                if(LAHelper::laravel_ver() == 5.3) {
-                    $this->copyFile($from . "/app/Controllers/Controller.5.3.php", $to . "/app/Http/Controllers/Controller.php");
-                } else {
+                if(LAHelper::is_recent_laravel_version()) {
                     $this->copyFile($from . "/app/Controllers/Controller.php", $to . "/app/Http/Controllers/Controller.php");
+                } else {
+                    $this->copyFile($from . "/app/Controllers/Legacy.Controller.php", $to . "/app/Http/Controllers/Controller.php");
                 }
                 $this->copyFile($from . "/app/Controllers/HomeController.php", $to . "/app/Http/Controllers/HomeController.php");
-                
+
                 // Middleware
-                if(LAHelper::laravel_ver() == 5.3) {
+                if(LAHelper::is_recent_laravel_version()) {
                     $this->copyFile($from . "/app/Middleware/RedirectIfAuthenticated.php", $to . "/app/Http/Middleware/RedirectIfAuthenticated.php");
                 }
-                
-                
+
+
                 // Config
                 $this->line('Generating Config...');
                 $this->copyFile($from . "/config/laraadmin.php", $to . "/config/laraadmin.php");
-                
+
                 // Models
                 $this->line('Generating Models...');
                 if(!file_exists($to . "/app/Models")) {
@@ -143,10 +143,10 @@ public function handle()
                 }
                 foreach($this->modelsInstalled as $model) {
                     if($model == "User") {
-                        if(LAHelper::laravel_ver() == 5.3) {
-                            $this->copyFile($from . "/app/Models/" . $model . "5.3.php", $to . "/app/" . $model . ".php");
-                        } else {
+                        if(LAHelper::is_recent_laravel_version()) {
                             $this->copyFile($from . "/app/Models/" . $model . ".php", $to . "/app/" . $model . ".php");
+                        } else {
+                            $this->copyFile($from . "/app/Models/Legacy." . $model . ".php", $to . "/app/" . $model . ".php");
                         }
                     } else if($model == "Role" || $model == "Permission") {
                         $this->copyFile($from . "/app/Models/" . $model . ".php", $to . "/app/" . $model . ".php");
@@ -154,7 +154,7 @@ public function handle()
                         $this->copyFile($from . "/app/Models/" . $model . ".php", $to . "/app/Models/" . $model . ".php");
                     }
                 }
-                
+
                 // Custom Admin Route
                 /*
                 $this->line("\nDefault admin url route is /admin");
@@ -167,7 +167,7 @@ public function handle()
                     config(['laraadmin.adminRoute' => $custom_admin_route]);
                 }
                 */
-                
+
                 // Generate Uploads / Thumbnails folders in /storage
                 $this->line('Generating Uploads / Thumbnails folders...');
                 if(!file_exists($to . "/storage/uploads")) {
@@ -178,12 +178,12 @@ public function handle()
                     $this->info("mkdir: (" . $to . "/storage/thumbnails)");
                     mkdir($to . "/storage/thumbnails");
                 }
-                
+
                 // la-assets
                 $this->line('Generating LaraAdmin Public Assets...');
                 $this->replaceFolder($from . "/la-assets", $to . "/public/la-assets");
                 // Use "git config core.fileMode false" for ignoring file permissions
-                
+
                 // check CACHE_DRIVER to be array or else
                 // It is required for Zizaco/Entrust
                 // https://github.com/Zizaco/entrust/issues/468
@@ -192,24 +192,24 @@ public function handle()
                     throw new Exception("Please set Cache Driver to array in .env (Required for Zizaco\Entrust) and run la:install again:"
                         . "\n\n\tCACHE_DRIVER=array\n\n", 1);
                 }
-                
+
                 // migrations
                 $this->line('Generating migrations...');
                 $this->copyFolder($from . "/migrations", $to . "/database/migrations");
-                
+
                 $this->line('Copying seeds...');
                 $this->copyFile($from . "/seeds/DatabaseSeeder.php", $to . "/database/seeds/DatabaseSeeder.php");
-                
-                
+
+
                 // resources
                 $this->line('Generating resources: assets + views...');
                 $this->copyFolder($from . "/resources/assets", $to . "/resources/assets");
                 $this->copyFolder($from . "/resources/views", $to . "/resources/views");
-                
+
                 // Checking database
                 $this->line('Checking database connectivity...');
                 DB::connection()->reconnect();
-                
+
                 // Running migrations...
                 $this->line('Running migrations...');
                 $this->call('clear-compiled');
@@ -223,35 +223,35 @@ public function handle()
                     $composer_path = "composer";
                 }
                 $this->info(exec($composer_path . ' dump-autoload'));
-                
+
                 $this->call('migrate:refresh');
                 // $this->call('migrate:refresh', ['--seed']);
-                
+
                 // $this->call('db:seed', ['--class' => 'LaraAdminSeeder']);
-                
+
                 // $this->line('Running seeds...');
                 // $this->info(exec('composer dump-autoload'));
                 $this->call('db:seed');
                 // Install Spatie Backup
                 $this->call('vendor:publish', ['--provider' => 'Spatie\Backup\BackupServiceProvider']);
-                
+
                 // Edit config/database.php for Spatie Backup Configuration
                 if(LAHelper::getLineWithString('config/database.php', "dump_command_path") == -1) {
                     $newDBConfig = "            'driver' => 'mysql',\n"
                         . "            'dump_command_path' => '/opt/lampp/bin', // only the path, so without 'mysqldump' or 'pg_dump'\n"
                         . "            'dump_command_timeout' => 60 * 5, // 5 minute timeout\n"
                         . "            'dump_using_single_transaction' => true, // perform dump using a single transaction\n";
-                    
+
                     $envfile = $this->openFile('config/database.php');
                     $mysqldriverline = LAHelper::getLineWithString('config/database.php', "'driver' => 'mysql'");
                     $envfile = str_replace($mysqldriverline, $newDBConfig, $envfile);
                     file_put_contents('config/database.php', $envfile);
                 }
-                
+
                 // Routes
                 $this->line('Appending routes...');
                 //if(!$this->fileContains($to."/app/Http/routes.php", "laraadmin.adminRoute")) {
-                if(LAHelper::laravel_ver() == 5.3) {
+                if(LAHelper::is_recent_laravel_version()) {
                     if(LAHelper::getLineWithString($to . "/routes/web.php", "require __DIR__.'/admin_routes.php';") == -1) {
                         $this->appendFile($from . "/app/routes.php", $to . "/routes/web.php");
                     }
@@ -262,30 +262,30 @@ public function handle()
                     }
                     $this->copyFile($from . "/app/admin_routes.php", $to . "/app/Http/admin_routes.php");
                 }
-                
+
                 // tests
                 $this->line('Generating tests...');
                 $this->copyFolder($from . "/tests", $to . "/tests");
-                if(LAHelper::laravel_ver() == 5.3) {
+                if(LAHelper::is_recent_laravel_version()) {
                     unlink($to . '/tests/TestCase.php');
                     rename($to . '/tests/TestCase5.3.php', $to . '/tests/TestCase.php');
                 } else {
                     unlink($to . '/tests/TestCase5.3.php');
                 }
-                
+
                 // Utilities
                 $this->line('Generating Utilities...');
                 // if(!$this->fileContains($to."/gulpfile.js", "admin-lte/AdminLTE.less")) {
-                if(LAHelper::getLineWithString($to . "/gulpfile.js", "mix.less('admin-lte/AdminLTE.less', 'public/la-assets/css');") == -1) {
-                    $this->appendFile($from . "/gulpfile.js", $to . "/gulpfile.js");
+                if(LAHelper::getLineWithString($to . '/'.$mix_file, "mix.less('admin-lte/AdminLTE.less', 'public/la-assets/css');") == -1) {
+                    $this->appendFile($from . '/'.$mix_file, $to . '/'.$mix_file);
                 }
                 // Creating Super Admin User
-                
+
                 $user = \App\User::where('context_id', "1")->first();
                 if(!isset($user['id'])) {
-                    
+
                     $this->line('Creating Super Admin User...');
-                    
+
                     $data = array();
                     $data['name'] = $this->ask('Super Admin name', 'Super Admin');
                     $data['email'] = $this->ask('Super Admin email', 'user@example.com');
@@ -293,10 +293,10 @@ public function handle()
                     $data['context_id'] = "1";
                     $data['type'] = "Employee";
                     $user = \App\User::create($data);
-                    
+
                     // TODO: This is Not Standard. Need to find alternative
                     Eloquent::unguard();
-                    
+
                     \App\Models\Employee::create([
                         'name' => $data['name'],
                         'designation' => "Super Admin",
@@ -313,7 +313,7 @@ public function handle()
                         'date_left' => date("Y-m-d"),
                         'salary_cur' => 0,
                     ]);
-                    
+
                     $this->info("Super Admin User '" . $data['name'] . "' successfully created. ");
                 } else {
                     $this->info("Super Admin User '" . $user['name'] . "' exists. ");
@@ -322,7 +322,7 @@ public function handle()
                 $user->attachRole($role);
                 $this->info("\nLaraAdmin successfully installed.");
                 $this->info("You can now login from yourdomain.com/" . config('laraadmin.adminRoute') . " !!!\n");
-                
+
             } else {
                 $this->error("Installation aborted. Please try again after backup / git. Thank you...");
             }
@@ -336,7 +336,7 @@ public function handle()
             }
         }
     }
-    
+
     /**
      * Copy Folder contents
      *
@@ -348,7 +348,7 @@ private function copyFolder($from, $to)
         // $this->info("copyFolder: ($from, $to)");
         LAHelper::recurse_copy($from, $to);
     }
-    
+
     /**
      * Replace Folder contents by deleting content of to folder first
      *
@@ -363,7 +363,7 @@ private function replaceFolder($from, $to)
         }
         LAHelper::recurse_copy($from, $to);
     }
-    
+
     /**
      * Copy file contents. If file not exists create it.
      *
@@ -379,7 +379,7 @@ private function copyFile($from, $to)
         }
         copy($from, $to);
     }
-    
+
     /**
      * Get file contents
      *
@@ -391,7 +391,7 @@ private function openFile($from)
         $md = file_get_contents($from);
         return $md;
     }
-    
+
     /**
      * Append content of 'from' file to 'to' file
      *
@@ -401,12 +401,12 @@ private function openFile($from)
     private function appendFile($from, $to)
     {
         // $this->info("appendFile: ($from, $to)");
-        
+
         $md = file_get_contents($from);
-        
+
         file_put_contents($to, $md, FILE_APPEND);
     }
-    
+
     /**
      * Copy contents from one file to another
      *
@@ -418,7 +418,7 @@ private function writeFile($from, $to)
         $md = file_get_contents($from);
         file_put_contents($to, $md);
     }
-    
+
     /**
      * does file contains given text
      *
@@ -429,7 +429,7 @@ private function writeFile($from, $to)
     private function fileContains($filePath, $text)
     {
         // TODO: Method not working properly
-        
+
         $fileData = file_get_contents($filePath);
         if(strpos($fileData, $text) === false) {
             return true;
diff --git a/src/Commands/Packaging.php b/src/Commands/Packaging.php
index 08a6be0d..57e5b37e 100644
--- a/src/Commands/Packaging.php
+++ b/src/Commands/Packaging.php
@@ -71,7 +71,7 @@ public function handle()
         
         // Routes
         $this->line('Exporting Routes...');
-        if(LAHelper::laravel_ver() == 5.3) {
+        if(LAHelper::is_recent_laravel_version()) {
             // $this->copyFile($from."/routes/web.php", $to."/app/routes.php"); // Not needed anymore
             $this->copyFile($from . "/routes/admin_routes.php", $to . "/app/admin_routes.php");
         } else {
diff --git a/src/Controllers/ModuleController.php b/src/Controllers/ModuleController.php
index 1844b6ce..b201130f 100644
--- a/src/Controllers/ModuleController.php
+++ b/src/Controllers/ModuleController.php
@@ -165,7 +165,7 @@ public function destroy($id)
         }
         
         // Delete Admin Routes
-        if(LAHelper::laravel_ver() == 5.3) {
+        if(LAHelper::is_recent_laravel_version()) {
             $file_admin_routes = base_path("/routes/admin_routes.php");
         } else {
             $file_admin_routes = base_path("/app/Http/admin_routes.php");
diff --git a/src/Helpers/LAHelper.php b/src/Helpers/LAHelper.php
index 3cf4703e..feeaf303 100644
--- a/src/Helpers/LAHelper.php
+++ b/src/Helpers/LAHelper.php
@@ -22,6 +22,8 @@
  */
 class LAHelper
 {
+
+    const RECENT_LARAVEL = 5.3;
     /**
      * Gives various names of Module in Object like label, table, model, controller, singular
      *
@@ -36,7 +38,7 @@ public static function generateModuleNames($module_name, $icon)
         $array = array();
         $module_name = trim($module_name);
         $module_name = str_replace(" ", "_", $module_name);
-        
+
         $array['module'] = ucfirst(str_plural($module_name));
         $array['label'] = ucfirst(str_plural($module_name));
         $array['table'] = strtolower(str_plural($module_name));
@@ -45,10 +47,10 @@ public static function generateModuleNames($module_name, $icon)
         $array['controller'] = $array['module'] . "Controller";
         $array['singular_l'] = strtolower(str_singular($module_name));
         $array['singular_c'] = ucfirst(str_singular($module_name));
-        
+
         return (object)$array;
     }
-    
+
     /**
      * Get list of Database tables excluding LaraAdmin Context tables like
      * backups, la_configs, la_menus, migrations, modules, module_fields, module_field_types
@@ -84,7 +86,7 @@ public static function getDBTables($remove_tables = [])
         } else {
             $tables = DB::select('SHOW TABLES');
         }
-        
+
         $tables_out = array();
         foreach($tables as $table) {
             $table = (Array)$table;
@@ -112,15 +114,15 @@ public static function getDBTables($remove_tables = [])
         $remove_tables = array_merge($remove_tables, $remove_tables2);
         $remove_tables = array_unique($remove_tables);
         $tables_out = array_diff($tables_out, $remove_tables);
-        
+
         $tables_out2 = array();
         foreach($tables_out as $table) {
             $tables_out2[$table] = $table;
         }
-        
+
         return $tables_out2;
     }
-    
+
     /**
      * Get Array of All Modules
      *
@@ -132,21 +134,21 @@ public static function getDBTables($remove_tables = [])
     public static function getModuleNames($remove_modules = [])
     {
         $modules = Module::all();
-        
+
         $modules_out = array();
         foreach($modules as $module) {
             $modules_out[] = $module->name;
         }
         $modules_out = array_diff($modules_out, $remove_modules);
-        
+
         $modules_out2 = array();
         foreach($modules_out as $module) {
             $modules_out2[$module] = $module;
         }
-        
+
         return $modules_out2;
     }
-    
+
     /**
      * Method to parse the dropdown, Multiselect, Taginput and radio values which are linked with
      * either other tables via "@" e.g. "@employees" or string array of values
@@ -182,7 +184,7 @@ public static function parseValues($value)
         }
         return $valueOut;
     }
-    
+
     /**
      * Log method to log either in command line or in Log file depending on $type.
      *
@@ -203,7 +205,7 @@ public static function log($type, $text, $commandObject)
             Log::$type($text);
         }
     }
-    
+
     /**
      * Method copies folder recursively into another
      *
@@ -230,7 +232,7 @@ public static function recurse_copy($src, $dst)
         }
         closedir($dir);
     }
-    
+
     /**
      * Method deletes folder and its content
      *
@@ -253,7 +255,7 @@ public static function recurse_delete($dir)
             rmdir($dir);
         }
     }
-    
+
     /**
      * Generate Random Password
      *
@@ -283,7 +285,7 @@ public static function gen_password($chars_min = 6, $chars_max = 8, $use_upper_c
         }
         return $password;
     }
-    
+
     /**
      * Get url of image by using $upload_id
      *
@@ -301,7 +303,7 @@ public static function img($upload_id)
             return "";
         }
     }
-    
+
     /**
      * Get Thumbnail image path of Uploaded image
      *
@@ -355,7 +357,7 @@ public static function createThumbnail($filepath, $thumbpath, $thumbnail_width,
         $imgt($new_image, $thumbpath);
         return file_exists($thumbpath);
     }
-    
+
     /**
      * Print the menu editor view.
      * This needs to be done recursively
@@ -367,9 +369,11 @@ public static function createThumbnail($filepath, $thumbpath, $thumbnail_width,
      */
     public static function print_menu_editor($menu)
     {
+
         $editing = \Collective\Html\FormFacade::open(['route' => [config('laraadmin.adminRoute') . '.la_menus.destroy', $menu->id], 'method' => 'delete', 'style' => 'display:inline']);
         $editing .= '<button class="btn btn-xs btn-danger pull-right"><i class="fa fa-times"></i></button>';
         $editing .= \Collective\Html\FormFacade::close();
+
         if($menu->type != "module") {
             $info = (object)array();
             $info->id = $menu->id;
@@ -377,15 +381,16 @@ public static function print_menu_editor($menu)
             $info->url = $menu->url;
             $info->type = $menu->type;
             $info->icon = $menu->icon;
-            
+
             $editing .= '<a class="editMenuBtn btn btn-xs btn-success pull-right" info=\'' . json_encode($info) . '\'><i class="fa fa-edit"></i></a>';
+            // dd($editing);
         }
         $str = '<li class="dd-item dd3-item" data-id="' . $menu->id . '">
 			<div class="dd-handle dd3-handle"></div>
 			<div class="dd3-content"><i class="fa ' . $menu->icon . '"></i> ' . $menu->name . ' ' . $editing . '</div>';
-        
+
         $childrens = \Dwij\Laraadmin\Models\Menu::where("parent", $menu->id)->orderBy('hierarchy', 'asc')->get();
-        
+
         if(count($childrens) > 0) {
             $str .= '<ol class="dd-list">';
             foreach($childrens as $children) {
@@ -394,9 +399,10 @@ public static function print_menu_editor($menu)
             $str .= '</ol>';
         }
         $str .= '</li>';
+
         return $str;
     }
-    
+
     /**
      * Print the sidebar menu view.
      * This needs to be done recursively
@@ -420,9 +426,9 @@ public static function print_menu($menu, $active = false)
         if($active) {
             $active_str = 'class="active"';
         }
-        
+
         $str = '<li' . $treeview . ' ' . $active_str . '><a href="' . url(config("laraadmin.adminRoute") . '/' . $menu->url) . '"><i class="fa ' . $menu->icon . '"></i> <span>' . LAHelper::real_module_name($menu->name) . '</span> ' . $subviewSign . '</a>';
-        
+
         if(count($childrens)) {
             $str .= '<ul class="treeview-menu">';
             foreach($childrens as $children) {
@@ -436,7 +442,7 @@ public static function print_menu($menu, $active = false)
         $str .= '</li>';
         return $str;
     }
-    
+
     /**
      * Print the top navbar menu view.
      * This needs to be done recursively
@@ -450,7 +456,7 @@ public static function print_menu($menu, $active = false)
     public static function print_menu_topnav($menu, $active = false)
     {
         $childrens = \Dwij\Laraadmin\Models\Menu::where("parent", $menu->id)->orderBy('hierarchy', 'asc')->get();
-        
+
         $treeview = "";
         $treeview2 = "";
         $subviewSign = "";
@@ -463,9 +469,9 @@ public static function print_menu_topnav($menu, $active = false)
         if($active) {
             $active_str = 'class="active"';
         }
-        
+
         $str = '<li ' . $treeview . '' . $active_str . '><a ' . $treeview2 . ' href="' . url(config("laraadmin.adminRoute") . '/' . $menu->url) . '">' . LAHelper::real_module_name($menu->name) . $subviewSign . '</a>';
-        
+
         if(count($childrens)) {
             $str .= '<ul class="dropdown-menu" role="menu">';
             foreach($childrens as $children) {
@@ -476,8 +482,11 @@ public static function print_menu_topnav($menu, $active = false)
         $str .= '</li>';
         return $str;
     }
-    
-    /**
+    public static function is_recent_laravel_version()
+    {
+        return self::laravel_ver() >= self::RECENT_LARAVEL;
+    }
+     /**
      * Get laravel version. very important in installation and handling Laravel 5.3 changes.
      *
      * LAHelper::laravel_ver()
@@ -487,19 +496,22 @@ public static function print_menu_topnav($menu, $active = false)
     public static function laravel_ver()
     {
         $var = \App::VERSION();
-        
+
         if(starts_with($var, "5.2")) {
             return 5.2;
         } else if(starts_with($var, "5.3")) {
             return 5.3;
-        } else if(substr_count($var, ".") == 3) {
+        } else if(starts_with($var, "5.4")) {
+            return 5.4;
+        }
+        else if(substr_count($var, ".") == 3) {
             $var = substr($var, 0, strrpos($var, "."));
             return $var . "-str";
         } else {
             return floatval($var);
         }
     }
-    
+
     /**
      * Get real Module name by replacing underscores within name
      *
@@ -511,7 +523,7 @@ public static function real_module_name($name)
         $name = str_replace('_', ' ', $name);
         return $name;
     }
-    
+
     /**
      * Get complete line within file by comparing passed substring $str
      *
@@ -531,7 +543,7 @@ public static function getLineWithString($fileName, $str)
         }
         return -1;
     }
-    
+
     /**
      * Get complete line within given file contents by comparing passed substring $str
      *
@@ -551,7 +563,7 @@ public static function getLineWithString2($content, $str)
         }
         return -1;
     }
-    
+
     /**
      * Method sets parameter in ".env" file as well as into php environment.
      *
@@ -562,16 +574,16 @@ public static function getLineWithString2($content, $str)
      */
     public static function setenv($param, $value)
     {
-        
+
         $envfile = LAHelper::openFile('.env');
         $line = LAHelper::getLineWithString('.env', $param . '=');
         $envfile = str_replace($line, $param . "=" . $value . "\n", $envfile);
         file_put_contents('.env', $envfile);
-        
+
         $_ENV[$param] = $value;
         putenv($param . "=" . $value);
     }
-    
+
     /**
      * Get file contents
      *
@@ -583,7 +595,7 @@ public static function openFile($from)
         $md = file_get_contents($from);
         return $md;
     }
-    
+
     /**
      * Delete file
      *
@@ -597,7 +609,7 @@ public static function deleteFile($file_path)
             unlink($file_path);
         }
     }
-    
+
     /**
      * Get Migration file name by passing matching table name
      *
@@ -619,7 +631,7 @@ public static function get_migration_file($file_name)
         }
         return "";
     }
-    
+
     /**
      * Check if passed array is associative
      *
@@ -630,7 +642,7 @@ public static function is_assoc_array(array $array)
     {
         // Keys of the array
         $keys = array_keys($array);
-        
+
         // If the array keys of the keys match the keys, then the array must
         // not be associative (e.g. the keys array looked like {0:0, 1:1...}).
         return array_keys($keys) !== $keys;
diff --git a/src/Installs/app/Controllers/Controller.php b/src/Installs/app/Controllers/Controller.php
index d492e0b3..03e02a23 100644
--- a/src/Installs/app/Controllers/Controller.php
+++ b/src/Installs/app/Controllers/Controller.php
@@ -6,9 +6,8 @@
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesResources;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 }
diff --git a/src/Installs/app/Controllers/Controller.5.3.php b/src/Installs/app/Controllers/Legacy.Controller.php
similarity index 67%
rename from src/Installs/app/Controllers/Controller.5.3.php
rename to src/Installs/app/Controllers/Legacy.Controller.php
index 03e02a23..d492e0b3 100644
--- a/src/Installs/app/Controllers/Controller.5.3.php
+++ b/src/Installs/app/Controllers/Legacy.Controller.php
@@ -6,8 +6,9 @@
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesResources;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests;
 }
diff --git a/src/Installs/app/Models/User5.3.php b/src/Installs/app/Models/Legacy.User.php
similarity index 81%
rename from src/Installs/app/Models/User5.3.php
rename to src/Installs/app/Models/Legacy.User.php
index 38738f03..d35f7da8 100644
--- a/src/Installs/app/Models/User5.3.php
+++ b/src/Installs/app/Models/Legacy.User.php
@@ -6,28 +6,22 @@
  * Developed by: Dwij IT Solutions
  * Developer Website: http://dwijitsolutions.com
  */
-
 namespace App;
-
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
-
 use Illuminate\Database\Eloquent\Model;
 // use Illuminate\Database\Eloquent\SoftDeletes;
 use Zizaco\Entrust\Traits\EntrustUserTrait;
-
-class User extends Authenticatable implements AuthorizableContract, CanResetPasswordContract
+class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract
 {
-    use Notifiable;
-    use CanResetPassword;
+    use Authenticatable, CanResetPassword;
     // use SoftDeletes;
     use EntrustUserTrait;
-
     protected $table = 'users';
-	
+
 	/**
      * The attributes that are mass assignable.
      *
@@ -36,7 +30,7 @@ class User extends Authenticatable implements AuthorizableContract, CanResetPass
 	protected $fillable = [
 		'name', 'email', 'password', "role", "context_id", "type"
 	];
-	
+
 	/**
      * The attributes that should be hidden for arrays.
      *
@@ -45,9 +39,8 @@ class User extends Authenticatable implements AuthorizableContract, CanResetPass
 	protected $hidden = [
 		'password', 'remember_token',
     ];
-    
-    // protected $dates = ['deleted_at'];
 
+    // protected $dates = ['deleted_at'];
     /**
      * @return mixed
      */
diff --git a/src/Installs/app/Models/User.php b/src/Installs/app/Models/User.php
index 5a49490d..045f151f 100644
--- a/src/Installs/app/Models/User.php
+++ b/src/Installs/app/Models/User.php
@@ -6,27 +6,23 @@
  * Developed by: Dwij IT Solutions
  * Developer Website: http://dwijitsolutions.com
  */
-
 namespace App;
-
-use Illuminate\Auth\Authenticatable;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
-
 use Illuminate\Database\Eloquent\Model;
 // use Illuminate\Database\Eloquent\SoftDeletes;
 use Zizaco\Entrust\Traits\EntrustUserTrait;
-
-class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract
+class User extends Authenticatable implements AuthorizableContract, CanResetPasswordContract
 {
-    use Authenticatable, CanResetPassword;
+    use Notifiable;
+    use CanResetPassword;
     // use SoftDeletes;
     use EntrustUserTrait;
-
     protected $table = 'users';
-	
+
 	/**
      * The attributes that are mass assignable.
      *
@@ -35,7 +31,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
 	protected $fillable = [
 		'name', 'email', 'password', "role", "context_id", "type"
 	];
-	
+
 	/**
      * The attributes that should be hidden for arrays.
      *
@@ -44,9 +40,8 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
 	protected $hidden = [
 		'password', 'remember_token',
     ];
-    
-    // protected $dates = ['deleted_at'];
 
+    // protected $dates = ['deleted_at'];
     /**
      * @return mixed
      */
diff --git a/src/Installs/app/admin_routes.php b/src/Installs/app/admin_routes.php
index 3814dd63..90c9903a 100644
--- a/src/Installs/app/admin_routes.php
+++ b/src/Installs/app/admin_routes.php
@@ -15,7 +15,7 @@
 */
 
 $as = "";
-if(\Dwij\Laraadmin\Helpers\LAHelper::laravel_ver() == 5.3) {
+if(\Dwij\Laraadmin\Helpers\LAHelper::is_recent_laravel_version()) {
 	$as = config('laraadmin.adminRoute').'.';
 	
 	// Routes for Laravel 5.3
diff --git a/src/Installs/gulpfile.js b/src/Installs/gulpfile.js
deleted file mode 100644
index 676c74f4..00000000
--- a/src/Installs/gulpfile.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// var elixir = require('laravel-elixir');
-
-elixir(function(mix) {
-    mix.less('admin-lte/AdminLTE.less', 'public/la-assets/css');
-    mix.less('bootstrap/bootstrap.less', 'public/la-assets/css');
-});
-
-/*
-var minify = require('gulp-minify');
-gulp.task('compress', function() {
-  gulp.src('lib/*.js')
-    .pipe(minify({
-        ext:{
-            src:'-debug.js',
-            min:'.js'
-        },
-        exclude: ['tasks'],
-        ignoreFiles: ['.combo.js', '-min.js']
-    }))
-    .pipe(gulp.dest('dist'))
-});
-*/
\ No newline at end of file
diff --git a/src/Installs/migrations/2014_05_26_060000_create_module_fields_table.php b/src/Installs/migrations/2014_05_26_060000_create_module_fields_table.php
index e62d497f..8cd35b26 100644
--- a/src/Installs/migrations/2014_05_26_060000_create_module_fields_table.php
+++ b/src/Installs/migrations/2014_05_26_060000_create_module_fields_table.php
@@ -24,12 +24,12 @@ public function up()
             $table->increments('id');
             $table->string('colname', 30);
             $table->string('label', 100);
-            $table->integer('module')->unsigned();
+            $table->unsignedInteger('module')->nullable();
             $table->foreign('module')->references('id')->on('modules')->onUpdate('cascade')->onDelete('cascade');
-            $table->integer('field_type')->unsigned();
+            $table->unsignedInteger('field_type')->nullable();
             $table->foreign('field_type')->references('id')->on('module_field_types')->onUpdate('cascade')->onDelete('cascade');
             $table->boolean('unique')->default(false);
-            $table->string('defaultvalue');
+            $table->string('defaultvalue')->nullable();
             $table->integer('minlength')->unsigned()->default(0);
             $table->integer('maxlength')->unsigned()->default(0);
             $table->boolean('required')->default(false);
diff --git a/src/Installs/migrations/2016_07_05_115343_create_role_user_table.php b/src/Installs/migrations/2016_07_05_115343_create_role_user_table.php
index 4ca3fb60..c084353e 100644
--- a/src/Installs/migrations/2016_07_05_115343_create_role_user_table.php
+++ b/src/Installs/migrations/2016_07_05_115343_create_role_user_table.php
@@ -23,9 +23,9 @@ public function up()
         Schema::create('role_user', function(Blueprint $table)
 		{
 			$table->increments('id');
-			$table->integer('role_id')->unsigned();
+			$table->unsignedInteger('role_id')->nullable();
 			$table->foreign('role_id')->references('id')->on('roles')->onUpdate('cascade')->onDelete('cascade');
-			$table->integer('user_id')->unsigned();
+			$table->unsignedInteger('user_id')->nullable();
 			$table->foreign('user_id')->references('id')->on('users')->onUpdate('cascade')->onDelete('cascade');
 			$table->timestamps();
 		});
diff --git a/src/Installs/migrations/2016_09_10_163520_create_permission_role_table.php b/src/Installs/migrations/2016_09_10_163520_create_permission_role_table.php
index 716a387b..e012d335 100644
--- a/src/Installs/migrations/2016_09_10_163520_create_permission_role_table.php
+++ b/src/Installs/migrations/2016_09_10_163520_create_permission_role_table.php
@@ -22,8 +22,8 @@ public function up()
     {
         // Create table for associating permissions to roles (Many-to-Many)
         Schema::create('permission_role', function (Blueprint $table) {
-            $table->integer('permission_id')->unsigned();
-            $table->integer('role_id')->unsigned();
+            $table->unsignedInteger('permission_id')->nullable();
+            $table->unsignedInteger('role_id')->nullable();
 
             $table->foreign('permission_id')->references('id')->on('permissions')
                 ->onUpdate('cascade')->onDelete('cascade');
diff --git a/src/Installs/migrations/2016_09_22_105958_role_module_fields_table.php b/src/Installs/migrations/2016_09_22_105958_role_module_fields_table.php
index dfbdb4ec..0ab73c7c 100644
--- a/src/Installs/migrations/2016_09_22_105958_role_module_fields_table.php
+++ b/src/Installs/migrations/2016_09_22_105958_role_module_fields_table.php
@@ -23,9 +23,9 @@ public function up()
         Schema::create('role_module_fields', function(Blueprint $table)
 		{
 			$table->increments('id');
-			$table->integer('role_id')->unsigned();
+			$table->unsignedInteger('role_id')->nullable();
 			$table->foreign('role_id')->references('id')->on('roles')->onUpdate('cascade')->onDelete('cascade');
-			$table->integer('field_id')->unsigned();
+			$table->unsignedInteger('field_id')->nullable();
 			$table->foreign('field_id')->references('id')->on('module_fields')->onUpdate('cascade')->onDelete('cascade');
             $table->enum('access', ['invisible', 'readonly', 'write']);
 			$table->timestamps();
diff --git a/src/Installs/migrations/2016_09_22_110008_role_module_table.php b/src/Installs/migrations/2016_09_22_110008_role_module_table.php
index 5a05bd29..eecae3c8 100644
--- a/src/Installs/migrations/2016_09_22_110008_role_module_table.php
+++ b/src/Installs/migrations/2016_09_22_110008_role_module_table.php
@@ -23,9 +23,9 @@ public function up()
         Schema::create('role_module', function(Blueprint $table)
 		{
 			$table->increments('id');
-			$table->integer('role_id')->unsigned();
+			$table->unsignedInteger('role_id')->nullable();
 			$table->foreign('role_id')->references('id')->on('roles')->onUpdate('cascade')->onDelete('cascade');
-			$table->integer('module_id')->unsigned();
+			$table->unsignedInteger('module_id')->nullable();
 			$table->foreign('module_id')->references('id')->on('modules')->onUpdate('cascade')->onDelete('cascade');
             $table->boolean('acc_view');
             $table->boolean('acc_create');
diff --git a/src/Installs/resources/views/la/modules/field_edit.blade.php b/src/Installs/resources/views/la/modules/field_edit.blade.php
index 09714f21..a27a0cb0 100644
--- a/src/Installs/resources/views/la/modules/field_edit.blade.php
+++ b/src/Installs/resources/views/la/modules/field_edit.blade.php
@@ -11,29 +11,29 @@
 @section("main-content")
 <div class="box">
 	<div class="box-header">
-		
+
 	</div>
 	<div class="box-body">
 		<div class="row">
 			<div class="col-md-8 col-md-offset-2">
 				{!! Form::model($field, ['route' => [config('laraadmin.adminRoute') . '.module_fields.update', $field->id ], 'method'=>'PUT', 'id' => 'field-edit-form']) !!}
 					{{ Form::hidden("module_id", $module->id) }}
-					
+
 					<div class="form-group">
 						<label for="label">Field Label :</label>
-						{{ Form::text("label", null, ['class'=>'form-control', 'placeholder'=>'Field Label', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>20, 'required' => 'required']) }}
+						{{ Form::text("label", null, ['class'=>'form-control', 'placeholder'=>'Field Label', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>30, 'required' => 'required']) }}
 					</div>
-					
+
 					<div class="form-group">
 						<label for="colname">Column Name :</label>
-						{{ Form::text("colname", null, ['class'=>'form-control', 'placeholder'=>'Column Name (lowercase)', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>20, 'data-rule-banned-words' => 'true', 'required' => 'required']) }}
+						{{ Form::text("colname", null, ['class'=>'form-control', 'placeholder'=>'Column Name (lowercase)', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>30, 'data-rule-banned-words' => 'true', 'required' => 'required']) }}
 					</div>
-					
+
 					<div class="form-group">
 						<label for="field_type">UI Type:</label>
 						{{ Form::select("field_type", $ftypes, null, ['class'=>'form-control', 'required' => 'required']) }}
 					</div>
-					
+
 					<div id="unique_val">
 						<div class="form-group">
 							<label for="unique">Unique:</label>
@@ -46,19 +46,19 @@
 						<label for="defaultvalue">Default Value :</label>
 						{{ Form::text("defaultvalue", null, ['class'=>'form-control', 'placeholder'=>'Default Value']) }}
 					</div>
-					
+
 					<div id="length_div">
 						<div class="form-group">
 							<label for="minlength">Minimum :</label>
 							{{ Form::number("minlength", null, ['class'=>'form-control', 'placeholder'=>'Default Value']) }}
 						</div>
-						
+
 						<div class="form-group">
 							<label for="maxlength">Maximum :</label>
 							{{ Form::number("maxlength", null, ['class'=>'form-control', 'placeholder'=>'Default Value']) }}
 						</div>
 					</div>
-					
+
 					<div class="form-group">
 						<label for="required">Required:</label>
 						{{ Form::checkbox("required", "required") }}
@@ -70,7 +70,7 @@
 						{{ Form::checkbox("listing_col", "listing_col") }}
 						<div class="Switch Round Off" style="vertical-align:top;margin-left:10px;"><div class="Toggle"></div></div>
 					</div>
-					
+
 					<div class="form-group values">
 						<label for="popup_vals">Values :</label>
 						<?php
@@ -90,7 +90,7 @@
 							<label>{{ Form::radio("popup_value_type", "list", $popup_value_type_list) }} From List</label>
 						</div>
 						{{ Form::select("popup_vals_table", $tables, $default_val, ['class'=>'form-control', 'rel' => '']) }}
-						
+
 						<select class="form-control popup_vals_list" rel="taginput" multiple="1" data-placeholder="Add Multiple values (Press Enter to add)" name="popup_vals_list[]">
 							@if(is_array($default_val))
 								@foreach ($default_val as $value)
@@ -98,18 +98,18 @@
 								@endforeach
 							@endif
 						</select>
-						
+
 						<?php
 						// print_r($tables);
 						?>
 					</div>
-					
+
                     <br>
 					<div class="form-group">
 						{!! Form::submit( 'Update', ['class'=>'btn btn-success']) !!} <a href="{{ url(config('laraadmin.adminRoute') . '/modules/'.$module->id) }}" class="btn btn-default pull-right">Cancel</a>
 					</div>
 				{!! Form::close() !!}
-				
+
 				@if($errors->any())
 				<ul class="alert alert-danger">
 					@foreach($errors->all() as $error)
@@ -130,7 +130,7 @@
 	$("select.popup_vals_list").show();
 	$("select.popup_vals_list").next().show();
 	$("select[name='popup_vals_table']").hide();
-	
+
 	function showValuesSection() {
 		var ft_val = $("select[name='field_type']").val();
 		if(ft_val == 7 || ft_val == 15 || ft_val == 18 || ft_val == 20) {
@@ -138,12 +138,12 @@ function showValuesSection() {
 		} else {
 			$(".form-group.values").hide();
 		}
-		
+
 		$('#length_div').removeClass("hide");
 		if(ft_val == 2 || ft_val == 4 || ft_val == 5 || ft_val == 7 || ft_val == 9 || ft_val == 11 || ft_val == 12 || ft_val == 15 || ft_val == 18 || ft_val == 21 || ft_val == 24 ) {
 			$('#length_div').addClass("hide");
 		}
-		
+
 		$('#unique_val').removeClass("hide");
 		if(ft_val == 1 || ft_val == 2 || ft_val == 3 || ft_val == 7 || ft_val == 9 || ft_val == 11 || ft_val == 12 || ft_val == 15 || ft_val == 18 || ft_val == 20 || ft_val == 21 || ft_val == 24 ) {
 			$('#unique_val').addClass("hide");
@@ -167,7 +167,7 @@ function showValuesTypes() {
 			$("select.popup_vals_list").next().hide();
 		}
 	}
-	
+
 	$("input[name='popup_value_type']").on("change", function() {
 		showValuesTypes();
 	});
@@ -178,8 +178,8 @@ function showValuesTypes() {
 	}, "Column name not allowed.");
 
 	$("#field-edit-form").validate({
-		
+
 	});
 });
 </script>
-@endpush
\ No newline at end of file
+@endpush
diff --git a/src/Installs/resources/views/la/modules/index.blade.php b/src/Installs/resources/views/la/modules/index.blade.php
index 0603d8b8..3b3f9f4b 100644
--- a/src/Installs/resources/views/la/modules/index.blade.php
+++ b/src/Installs/resources/views/la/modules/index.blade.php
@@ -30,7 +30,7 @@
 			<th>Actions</th>
 		</tr>
 		</thead>
-		<tbody>	
+		<tbody>
 
 			@foreach ($modules as $module)
 				<tr>
@@ -63,8 +63,8 @@
 				<div class="box-body">
 					<!--<div class="form-group">
 						<label for="name">Module Name :</label>
-						{{ Form::text("name", null, ['class'=>'form-control', 'placeholder'=>'Module Name', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>20, 'required' => 'required']) }}
-					</div>-->				
+						{{ Form::text("name", null, ['class'=>'form-control', 'placeholder'=>'Module Name', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>30, 'required' => 'required']) }}
+					</div>-->
 					<div class="form-group">
 						<label for="table">Table</label>
 						<?php
@@ -109,7 +109,7 @@
 				<div class="box-body">
 					<div class="form-group">
 						<label for="name">Module Name :</label>
-						{{ Form::text("name", null, ['class'=>'form-control', 'placeholder'=>'Module Name', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>20, 'required' => 'required']) }}
+						{{ Form::text("name", null, ['class'=>'form-control', 'placeholder'=>'Module Name', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>30, 'required' => 'required']) }}
 					</div>
 					<div class="form-group">
 						<label for="icon">Icon</label>
@@ -149,7 +149,7 @@
 				{{ Form::open(['route' => [config('laraadmin.adminRoute') . '.modules.destroy', 0], 'id' => 'module_del_form', 'method' => 'delete', 'style'=>'display:inline']) }}
 					<button class="btn btn-danger btn-delete pull-left" type="submit">Yes</button>
 				{{ Form::close() }}
-				<a data-dismiss="modal" class="btn btn-default pull-right" >No</a>				
+				<a data-dismiss="modal" class="btn btn-default pull-right" >No</a>
 			</div>
 		</div>
 		<!-- /.modal-content -->
@@ -221,7 +221,7 @@
 			success: function(data) {
 				var files = data.files;
 				var filesList = "<ul>";
-				for ($i = 0; $i < files.length; $i++) { 
+				for ($i = 0; $i < files.length; $i++) {
 					filesList += "<li>" + files[$i] + "</li>";
 				}
 				filesList += "</ul>";
@@ -231,11 +231,11 @@
 	});
 
 	$('.update_module').on("click", function () {
-    	var module_id = $(this).attr('module_id');	 
+    	var module_id = $(this).attr('module_id');
 		var module_label = $(this).attr('module_label');
 		var module_icon = $(this).attr('module_icon');
 		$(".module_label_edit").val(module_label);
-		$(".module_icon_edit").val(module_icon);		
+		$(".module_icon_edit").val(module_icon);
 		$("#module_update").modal('show');
 		$(".update-icon").html('<center><i class="fa '+module_icon+'"></i></center>');
 
@@ -252,13 +252,13 @@
 			});
 		});
 	});
-	
+
 	$('input[name=icon]').iconpicker();
 	$("#dt_modules").DataTable({
-		
+
 	});
 	$("#module-add-form").validate({
-		
+
 	});
 });
 </script>
diff --git a/src/Installs/resources/views/la/modules/show.blade.php b/src/Installs/resources/views/la/modules/show.blade.php
index b9f13b6d..dd8dacc2 100644
--- a/src/Installs/resources/views/la/modules/show.blade.php
+++ b/src/Installs/resources/views/la/modules/show.blade.php
@@ -40,7 +40,7 @@
 				@endif
 			</div>
 		</div>
-		
+
 		<div class="col-md-4">
 			@if($module->view_col != "")
 				@if(isset($module->is_gen) && $module->is_gen)
@@ -48,14 +48,14 @@
 					<div class="dats1 text-center"><a data-toggle="tooltip" data-placement="left" title="Update Migration File" class="btn btn-sm btn-success" style="border-color:#FFF;" id="update_migr" href="#"><i class="fa fa-database"></i> Update Migration</a></div>
 				@else
 					<div class="dats1 text-center"><a data-toggle="tooltip" data-placement="left" title="Generate Migration + CRUD + Module" class="btn btn-sm btn-success" style="border-color:#FFF;" id="generate_migr_crud" href="#"><i class="fa fa-cube"></i> Generate Migration + CRUD</a></div>
-					
+
  					<div class="dats1 text-center"><a data-toggle="tooltip" data-placement="left" title="Generate Migration File" class="btn btn-sm btn-success" style="border-color:#FFF;" id="generate_migr" href="#"><i class="fa fa-database"></i> Generate Migration</a></div>
 				@endif
 			@else
 				<div class="dats1 text-center">To generate Migration or CRUD, set the view column using the <i class='fa fa-eye'></i> icon next to a column</div>
 			@endif
 		</div>
-		
+
 		<div class="col-md-1 actions">
 			<button module_name="{{ $module->name }}" module_id="{{ $module->id }}" class="btn btn-default btn-delete btn-xs delete_module"><i class="fa fa-times"></i></button>
 		</div>
@@ -63,19 +63,19 @@
 
 	<ul id="module-tabs" data-toggle="ajax-tab" class="nav nav-tabs profile" role="tablist">
 		<li class=""><a href="{{ url(config('laraadmin.adminRoute') . '/modules') }}" data-toggle="tooltip" data-placement="right" title="Back to Modules"> <i class="fa fa-chevron-left"></i>&nbsp;</a></li>
-		
+
 		<li class="tab-pane" id="fields">
 			<a id="tab_fields" role="tab" data-toggle="tab" class="tab_info" href="#fields" data-target="#tab-info"><i class="fa fa-bars"></i> Module Fields</a>
 		</li>
-		
+
 		<li class="tab-pane" id="access">
 			<a id="tab_access" role="tab" data-toggle="tab"  class="tab_info " href="#access" data-target="#tab-access"><i class="fa fa-key"></i> Access</a>
 		</li>
-		
+
 		<li class="tab-pane" id="sort">
 			<a id="tab_sort" role="tab" data-toggle="tab"  class="tab_info " href="#sort" data-target="#tab-sort"><i class="fa fa-sort"></i> Sort</a>
 		</li>
-		
+
 		<a data-toggle="modal" data-target="#AddFieldModal" class="btn btn-success btn-sm pull-right btn-add-field" style="margin-top:10px;margin-right:10px;">Add Field</a>
 	</ul>
 
@@ -105,7 +105,7 @@
 							<th style="min-width:60px;"><i class="fa fa-cogs"></i></th>
 						</tr>
 						</thead>
-						<tbody>														
+						<tbody>
 							@foreach ($module->fields as $field)
 								<tr>
 									<td style="display:none;">{{ $field['sort'] }}</td>
@@ -173,7 +173,7 @@
 					@foreach($roles as $role)
 						<tr class="tr-access-basic" role_id="{{ $role->id }}">
 							<td><input class="role_checkb" type="checkbox" name="module_{{ $role->id }}" id="module_{{ $role->id }}" checked="checked"> {{ $role->name }}</td>
-							
+
 							<td><input class="view_checkb" type="checkbox" name="module_view_{{$role->id}}" id="module_view_{{$role->id}}" <?php if($role->view == 1) { echo 'checked="checked"'; } ?> ></td>
 							<td><input class="create_checkb" type="checkbox" name="module_create_{{$role->id}}" id="module_create_{{$role->id}}" <?php if($role->create == 1) { echo 'checked="checked"'; } ?> ></td>
 							<td><input class="edit_checkb" type="checkbox" name="module_edit_{{$role->id}}" id="module_edit_{{$role->id}}" <?php if($role->edit == 1) { echo 'checked="checked"'; } ?> ></td>
@@ -241,7 +241,7 @@
 				{{ Form::open(['route' => [config('laraadmin.adminRoute') . '.modules.destroy', 0], 'id' => 'module_del_form', 'method' => 'delete', 'style'=>'display:inline']) }}
 					<button class="btn btn-danger btn-delete pull-left" type="submit">Yes</button>
 				{{ Form::close() }}
-				<a data-dismiss="modal" class="btn btn-default pull-right" >No</a>				
+				<a data-dismiss="modal" class="btn btn-default pull-right" >No</a>
 			</div>
 		</div>
 		<!-- /.modal-content -->
@@ -262,9 +262,9 @@
 				<div class="box-body">
 					<div class="form-group">
 						<label for="label">Field Label :</label>
-						{{ Form::text("label", null, ['class'=>'form-control', 'placeholder'=>'Field Label', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>20, 'required' => 'required']) }}
+						{{ Form::text("label", null, ['class'=>'form-control', 'placeholder'=>'Field Label', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>30, 'required' => 'required']) }}
 					</div>
-					
+
 					<div class="form-group">
 						<label for="colname">Column Name :</label>
 						<?php
@@ -280,31 +280,31 @@
 									$default = "None";
 								} else {
 									$default = $column->getDefault();
-								}									
-								$col_list[$col] = $col." - ".$column->getType().' - '.$column->getLength().' - '.$default; 
+								}
+								$col_list[$col] = $col." - ".$column->getType().' - '.$column->getLength().' - '.$default;
 							}
 						}
 
 						if($module->is_gen == 0 && count($col_list) > 0) { ?>
 							{{ Form::select("colname", $col_list, $col_list, ['class'=>'form-control', 'required' => 'required']) }}
 						<?php } else { ?>
-							{{ Form::text("colname", null, ['class'=>'form-control', 'placeholder'=>'Column Name (lowercase)', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>20, 'data-rule-banned-words' => 'true', 'required' => 'required']) }}
+							{{ Form::text("colname", null, ['class'=>'form-control', 'placeholder'=>'Column Name (lowercase)', 'data-rule-minlength' => 2, 'data-rule-maxlength'=>30, 'data-rule-banned-words' => 'true', 'required' => 'required']) }}
 						<?php }	?>
 					</div>
-					
+
 					<div class="form-group">
 						<label for="field_type">UI Type:</label>
 						{{ Form::select("field_type", $ftypes, null, ['class'=>'form-control', 'required' => 'required']) }}
 					</div>
-					
+
 					<div id="unique_val">
 						<div class="form-group">
 							<label for="unique">Unique:</label>
 							{{ Form::checkbox("unique", "unique", false, []) }}
 							<div class="Switch Round Off" style="vertical-align:top;margin-left:10px;"><div class="Toggle"></div></div>
 						</div>
-					</div>	
-					
+					</div>
+
 					<div id="default_val">
 						<div class="form-group">
 							<label for="defaultvalue">Default Value :</label>
@@ -317,19 +317,19 @@
 							<label for="minlength">Minimum :</label>
 							{{ Form::number("minlength", null, ['class'=>'form-control', 'placeholder'=>'Minimum Value']) }}
 						</div>
-						
+
 						<div class="form-group">
 							<label for="maxlength">Maximum :</label>
 							{{ Form::number("maxlength", null, ['class'=>'form-control', 'placeholder'=>'Maximum Value']) }}
 						</div>
 					</div>
-					
+
 					<div class="form-group">
 						<label for="required">Required:</label>
 						{{ Form::checkbox("required", "required", false, []) }}
 						<div class="Switch Round Off" style="vertical-align:top;margin-left:10px;"><div class="Toggle"></div></div>
 					</div>
-					
+
 					<div class="form-group">
 						<label for="listing_col">Show in Index Listing:</label>
 						{{ Form::checkbox("listing_col", "listing_col", false, []) }}
@@ -341,7 +341,7 @@
 						{{-- Form::text("popup_vals", null, ['class'=>'form-control', 'placeholder'=>'Popup Values (Only for Radio, Dropdown, Multiselect, Taginput)']) --}}
 					</div>
 					-->
-					
+
 					<div class="form-group values">
 						<label for="popup_vals">Values :</label>
 						<div class="radio" style="margin-bottom:20px;">
@@ -349,7 +349,7 @@
 							<label>{{ Form::radio("popup_value_type", "list", false) }} From List</label>
 						</div>
 						{{ Form::select("popup_vals_table", $tables, "", ['id'=>'popup_vals_table', 'class'=>'form-control', 'rel' => '']) }}
-						
+
 						<select id="popup_vals_list" class="form-control popup_vals_list" rel="taginput" multiple="1" data-placeholder="Add Multiple values (Press Enter to add)" name="popup_vals_list[]">
 							@if(env('APP_ENV') == "testing")
 								<option>Bloomsbury</option>
@@ -358,7 +358,7 @@
 							@endif
 						</select>
 					</div>
-					
+
 				</div>
 			</div>
 			<div class="modal-footer">
@@ -414,7 +414,7 @@
 <script>
 
 $(function () {
-	
+
 	$("select.popup_vals_list").show();
 	$("select.popup_vals_list").next().show();
 	$("select[name='popup_vals']").hide();
@@ -438,7 +438,7 @@
 			success: function(data) {
 				var files = data.files;
 				var filesList = "<ul>";
-				for ($i = 0; $i < files.length; $i++) { 
+				for ($i = 0; $i < files.length; $i++) {
 					filesList += "<li>" + files[$i] + "</li>";
 				}
 				filesList += "</ul>";
@@ -446,7 +446,7 @@
 			}
 		});
 	});
-	
+
 	function showValuesSection() {
 		var ft_val = $("select[name='field_type']").val();
 		if(ft_val == 7 || ft_val == 15 || ft_val == 18 || ft_val == 20) {
@@ -454,7 +454,7 @@ function showValuesSection() {
 		} else {
 			$(".form-group.values").hide();
 		}
-				
+
 		$('#length_div').removeClass("hide");
 		if(ft_val == 2 || ft_val == 4 || ft_val == 5 || ft_val == 7 || ft_val == 9 || ft_val == 11 || ft_val == 12 || ft_val == 15 || ft_val == 18 || ft_val == 21 || ft_val == 24 ) {
 			$('#length_div').addClass("hide");
@@ -488,7 +488,7 @@ function showValuesTypes() {
 			$("select.popup_vals_list").next().hide();
 		}
 	}
-	
+
 	$("input[name='popup_value_type']").on("change", function() {
 		showValuesTypes();
 	});
@@ -504,7 +504,7 @@ function showValuesTypes() {
 					array.push(field_id);
 				}
 			});
-			
+
 			$.ajax({
 				url: "{{ url(config('laraadmin.adminRoute') . '/save_module_field_sort') }}/"+{{ $module->id }},
 				data : {'sort_array': array},
@@ -515,8 +515,8 @@ function showValuesTypes() {
 			});
         },
 	});
-    $("#sortable_module_fields").disableSelection();	
-	
+    $("#sortable_module_fields").disableSelection();
+
 	$("#generate_migr").on("click", function() {
 		var $fa = $(this).find("i");
 		$fa.removeClass("fa-database");
@@ -568,7 +568,7 @@ function showValuesTypes() {
 			}
 		});
 	});
-	
+
 	$("#generate_migr_crud").on("click", function() {
 		var $fa = $(this).find("i");
 		$fa.removeClass("fa-cube");
@@ -597,30 +597,30 @@ function showValuesTypes() {
 			});
 		}
 	});
-	
+
 	$.validator.addMethod("data-rule-banned-words", function(value) {
 		return $.inArray(value, ['files']) == -1;
 	}, "Column name not allowed.");
 
 	$("#field-form").validate();
-		
+
 	/* ================== Tab Selection ================== */
-	
+
 	var $tabs = $('#module-tabs').tabs();
-	
+
 	var url = window.location.href;
 	var activeTab = url.substring(url.indexOf("#") + 1);
-	
+
 	if(!activeTab.includes("http") && activeTab.length > 1) {
 		$('#module-tabs #'+activeTab+' a').tab('show');
 	} else {
 		$('#module-tabs #fields a').tab('show');
 	}
-	
+
 	/* ================== Access Control ================== */
-	
+
 	$('.slider').slider();
-	
+
 	$(".slider.slider-horizontal").each(function(index) {
 		var field = $(this).next().attr("name");
 		var value = $(this).next().val();
@@ -643,7 +643,7 @@ function showValuesTypes() {
 				break;
 		}
 	});
-	
+
 	$('.slider').bind('slideStop', function(event) {
 		if($(this).next().attr("name")) {
 			var field = $(this).next().attr("name");
@@ -675,9 +675,9 @@ function showValuesTypes() {
 		$("#view_all").prop('checked', this.checked);
 		$("#create_all").prop('checked', this.checked);
 		$("#edit_all").prop('checked', this.checked);
-		$("#delete_all").prop('checked', this.checked);		
+		$("#delete_all").prop('checked', this.checked);
 	});
-	
+
 	$("#create_all").on("change", function() {
 		$(".create_checkb").prop('checked', this.checked);
 		if($('#create_all').is(':checked')){
@@ -687,7 +687,7 @@ function showValuesTypes() {
 			$("#view_all").prop('checked', this.checked);
 		}
 	});
-	
+
 	$("#edit_all").on("change", function() {
 		$(".edit_checkb").prop('checked', this.checked);
 		if($('#edit_all').is(':checked')){
@@ -697,7 +697,7 @@ function showValuesTypes() {
 			$("#view_all").prop('checked', this.checked);
 		}
 	});
-	
+
 	$("#delete_all").on("change", function() {
 		$(".delete_checkb").prop('checked', this.checked);
 		if($('#delete_all').is(':checked')){
@@ -707,8 +707,8 @@ function showValuesTypes() {
 			$("#view_all").prop('checked', this.checked);
 		}
 	});
-	
-	$(".hide_row").on("click", function() { 
+
+	$(".hide_row").on("click", function() {
 		var val = $(this).attr( "role_id" );
 		var $icon = $(".hide_row[role_id="+val+"] > i");
 		if($('.module_fields_'+val).hasClass('hide')) {
diff --git a/src/Installs/webpack.mix.js b/src/Installs/webpack.mix.js
new file mode 100644
index 00000000..3e6f5712
--- /dev/null
+++ b/src/Installs/webpack.mix.js
@@ -0,0 +1,15 @@
+const { mix } = require('laravel-mix');
+
+/*
+ |--------------------------------------------------------------------------
+ | Mix Asset Management
+ |--------------------------------------------------------------------------
+ |
+ | Mix provides a clean, fluent API for defining some Webpack build steps
+ | for your Laravel application. By default, we are compiling the Sass
+ | file for the application as well as bundling up all the JS files.
+ |
+ */
+
+mix.js('resources/assets/js/app.js', 'public/js')
+   .sass('resources/assets/sass/app.scss', 'public/css');
diff --git a/src/LAFormMaker.php b/src/LAFormMaker.php
index a96b6524..ab5a9c8d 100644
--- a/src/LAFormMaker.php
+++ b/src/LAFormMaker.php
@@ -41,12 +41,12 @@ public static function input($module, $field_name, $default_val = null, $require
     {
         // Check Field Write Aceess
         if(Module::hasFieldAccess($module->id, $module->fields[$field_name]['id'], $access_type = "write")) {
-            
+
             $row = null;
             if(isset($module->row)) {
                 $row = $module->row;
             }
-            
+
             //print_r($module->fields);
             $label = $module->fields[$field_name]['label'];
             $field_type = $module->fields[$field_name]['field_type'];
@@ -56,16 +56,16 @@ public static function input($module, $field_name, $default_val = null, $require
             $maxlength = $module->fields[$field_name]['maxlength'];
             $required = $module->fields[$field_name]['required'];
             $popup_vals = $module->fields[$field_name]['popup_vals'];
-            
+
             if($required2 != null) {
                 $required = $required2;
             }
-            
+
             $field_type = ModuleFieldTypes::find($field_type);
-            
+
             $out = '<div class="form-group">';
             $required_ast = "";
-            
+
             if(!isset($params['class'])) {
                 $params['class'] = $class;
             }
@@ -91,16 +91,16 @@ public static function input($module, $field_name, $default_val = null, $require
                 }
                 $out .= '<input type="hidden" name="_token_' . $module->fields[$field_name]['id'] . '" value="' . csrf_token() . '">';
             }
-            
+
             if($required && !isset($params['required'])) {
                 $params['required'] = $required;
                 $required_ast = "*";
             }
-            
+
             switch($field_type->name) {
                 case 'Address':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -108,7 +108,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $params['cols'] = 30;
                     $params['rows'] = 3;
                     $out .= Form::textarea($field_name, $default_val, $params);
@@ -116,11 +116,11 @@ public static function input($module, $field_name, $default_val = null, $require
                 case 'Checkbox':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
                     $out .= '<input type="hidden" value="false" name="' . $field_name . '_hidden">';
-                    
+
                     // ############### Remaining
                     unset($params['placeholder']);
                     unset($params['data-rule-maxlength']);
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -128,13 +128,13 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $out .= Form::checkbox($field_name, $field_name, $default_val, $params);
                     $out .= '<div class="Switch Round On" style="vertical-align:top;margin-left:10px;"><div class="Toggle"></div></div>';
                     break;
                 case 'Currency':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -142,7 +142,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     if($params['data-rule-maxlength'] != "" && $params['data-rule-maxlength'] != 0) {
                         $params['max'] = $params['data-rule-maxlength'];
                     }
@@ -152,14 +152,14 @@ public static function input($module, $field_name, $default_val = null, $require
 
                     unset($params['data-rule-minlength']);
                     unset($params['data-rule-maxlength']);
-                    
+
                     $params['data-rule-currency'] = "true";
                     $params['min'] = "0";
                     $out .= Form::number($field_name, $default_val, $params);
                     break;
                 case 'Date':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -175,10 +175,10 @@ public static function input($module, $field_name, $default_val = null, $require
                     } else if($default_val != "") {
                         $dval = date("d/m/Y", strtotime($default_val));
                     }
-                    
+
                     unset($params['data-rule-maxlength']);
                     // $params['data-rule-date'] = "true";
-                    
+
                     $out .= "<div class='input-group date'>";
                     $out .= Form::text($field_name, $dval, $params);
                     $out .= "<span class='input-group-addon input_dt'><span class='fa fa-calendar'></span></span><span class='input-group-addon null_date'><input class='cb_null_date' type='checkbox' name='null_date_" . $field_name . "' $is_null value='true'> Null ?</span></div>";
@@ -186,16 +186,16 @@ public static function input($module, $field_name, $default_val = null, $require
                     break;
                 case 'Datetime':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
-                    
+
                     // Override the edit value
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $is_null = "";
                     if($default_val == "NULL") {
                         $is_null = " checked";
@@ -203,7 +203,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     } else if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
-                    
+
                     // ############### Remaining
                     $dval = $default_val;
                     if($default_val == "now()") {
@@ -217,7 +217,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     break;
                 case 'Decimal':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -225,7 +225,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     if($params['data-rule-maxlength'] != "" && $params['data-rule-maxlength'] != 0) {
                         $params['max'] = $params['data-rule-maxlength'];
                     }
@@ -246,7 +246,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     $params['data-placeholder'] = $params['placeholder'];
                     unset($params['placeholder']);
                     $params['rel'] = "select2";
-                    
+
                     //echo $defaultvalue;
                     if($default_val == null) {
                         $default_val = $defaultvalue;
@@ -258,28 +258,28 @@ public static function input($module, $field_name, $default_val = null, $require
                         // When Adding Record if we dont have default value let's not show NULL By Default
                         $default_val = "0";
                     }
-                    
+
                     // Bug here - NULL value Item still shows Not null in Form
                     if($default_val == NULL) {
                         $params['disabled'] = "";
                     }
-                    
+
                     $popup_vals_str = $popup_vals;
                     if($popup_vals != "") {
                         $popup_vals = LAFormMaker::process_values($popup_vals);
                     } else {
                         $popup_vals = array();
                     }
-                    
+
                     if(!$required) {
                         array_unshift($popup_vals, "None");
                     }
                     $out .= Form::select($field_name, $popup_vals, $default_val, $params);
-                    
+
                     break;
                 case 'Email':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -287,13 +287,13 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $params['data-rule-email'] = "true";
                     $out .= Form::email($field_name, $default_val, $params);
                     break;
                 case 'File':
                     $out .= '<label for="' . $field_name . '" style="display:block;">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -305,7 +305,7 @@ public static function input($module, $field_name, $default_val = null, $require
                         $default_val = 0;
                     }
                     $out .= Form::hidden($field_name, $default_val, $params);
-                    
+
                     if($default_val != 0) {
                         $upload = \App\Models\Upload::find($default_val);
                     }
@@ -317,10 +317,10 @@ public static function input($module, $field_name, $default_val = null, $require
                             <a class='uploaded_file hide' target='_blank'><i class='fa fa-file-o'></i><i title='Remove File' class='fa fa-times'></i></a>";
                     }
                     break;
-                
+
                 case 'Files':
                     $out .= '<label for="' . $field_name . '" style="display:block;">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -331,9 +331,9 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(is_array($default_val)) {
                         $default_val = json_encode($default_val);
                     }
-                    
+
                     $default_val_arr = json_decode($default_val);
-                    
+
                     if(is_array($default_val_arr) && count($default_val_arr) > 0) {
                         $uploadIds = array();
                         $uploadImages = "";
@@ -350,7 +350,7 @@ public static function input($module, $field_name, $default_val = null, $require
                                 $uploadImages .= "<a class='uploaded_file2' upload_id='" . $upload->id . "' target='_blank' href='" . url("files/" . $upload->hash . DIRECTORY_SEPARATOR . $upload->name) . "'>" . $fileImage . "<i title='Remove File' class='fa fa-times'></i></a>";
                             }
                         }
-                        
+
                         $out .= Form::hidden($field_name, json_encode($uploadIds), $params);
                         if(count($uploadIds) > 0) {
                             $out .= "<div class='uploaded_files'>" . $uploadImages . "</div>";
@@ -361,10 +361,10 @@ public static function input($module, $field_name, $default_val = null, $require
                     }
                     $out .= "<a class='btn btn-default btn_upload_files' file_type='files' selecter='" . $field_name . "' style='margin-top:5px;'>Upload <i class='fa fa-cloud-upload'></i></a>";
                     break;
-                
+
                 case 'Float':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -372,7 +372,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     if($params['data-rule-maxlength'] != "" && $params['data-rule-maxlength'] != 0) {
                         $params['max'] = $params['data-rule-maxlength'];
                     }
@@ -387,7 +387,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     break;
                 case 'HTML':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -400,7 +400,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     break;
                 case 'Image':
                     $out .= '<label for="' . $field_name . '" style="display:block;">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -412,7 +412,7 @@ public static function input($module, $field_name, $default_val = null, $require
                         $default_val = 0;
                     }
                     $out .= Form::hidden($field_name, $default_val, $params);
-                    
+
                     if($default_val != 0) {
                         $upload = \App\Models\Upload::find($default_val);
                     }
@@ -423,11 +423,11 @@ public static function input($module, $field_name, $default_val = null, $require
                         $out .= "<a class='btn btn-default btn_upload_image' file_type='image' selecter='" . $field_name . "'>Upload <i class='fa fa-cloud-upload'></i></a>
                             <div class='uploaded_image hide'><img src=''><i title='Remove Image' class='fa fa-times'></i></div>";
                     }
-                    
+
                     break;
                 case 'Integer':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($params['data-rule-maxlength'] != "" && $params['data-rule-maxlength'] != 0) {
                         $params['max'] = $params['data-rule-maxlength'];
                     }
@@ -437,7 +437,7 @@ public static function input($module, $field_name, $default_val = null, $require
 
                     unset($params['data-rule-minlength']);
                     unset($params['data-rule-maxlength']);
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -450,7 +450,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     break;
                 case 'Mobile':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -458,12 +458,12 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $out .= Form::text($field_name, $default_val, $params);
                     break;
                 case 'Multiselect':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     unset($params['data-rule-maxlength']);
                     $params['data-placeholder'] = "Select multiple " . str_plural($label);
                     unset($params['placeholder']);
@@ -480,7 +480,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = json_decode($row->$field_name);
                     }
-                    
+
                     if($popup_vals != "") {
                         $popup_vals = LAFormMaker::process_values($popup_vals);
                     } else {
@@ -490,7 +490,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     break;
                 case 'Name':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -498,21 +498,21 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $out .= Form::text($field_name, $default_val, $params);
                     break;
                 case 'Password':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     $out .= Form::password($field_name, $params);
                     break;
                 case 'Radio':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' : </label><br>';
-                    
+
                     // ############### Remaining
                     unset($params['placeholder']);
                     unset($params['data-rule-maxlength']);
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -520,7 +520,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     if(starts_with($popup_vals, "@")) {
                         $popup_vals = LAFormMaker::process_values($popup_vals);
                         $out .= '<div class="radio">';
@@ -552,7 +552,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     }
                 case 'String':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -564,7 +564,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     break;
                 case 'Taginput':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if(isset($params['data-rule-maxlength'])) {
                         $params['maximumSelectionLength'] = $params['data-rule-maxlength'];
                         unset($params['data-rule-maxlength']);
@@ -573,12 +573,12 @@ public static function input($module, $field_name, $default_val = null, $require
                     $params['rel'] = "taginput";
                     $params['data-placeholder'] = "Add multiple " . str_plural($label);
                     unset($params['placeholder']);
-                    
+
                     // Override the edit value
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = json_decode($row->$field_name);
                     }
-                    
+
                     if($default_val == null) {
                         $defaultvalue2 = json_decode($defaultvalue);
                         if(is_array($defaultvalue2)) {
@@ -598,10 +598,10 @@ public static function input($module, $field_name, $default_val = null, $require
                     break;
                 case 'Textarea':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     $params['cols'] = 30;
                     $params['rows'] = 3;
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -609,12 +609,12 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $out .= Form::textarea($field_name, $default_val, $params);
                     break;
                 case 'TextField':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -622,12 +622,12 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $out .= Form::text($field_name, $default_val, $params);
                     break;
                 case 'URL':
                     $out .= '<label for="' . $field_name . '">' . $label . $required_ast . ' :</label>';
-                    
+
                     if($default_val == null) {
                         $default_val = $defaultvalue;
                     }
@@ -635,7 +635,7 @@ public static function input($module, $field_name, $default_val = null, $require
                     if(isset($row) && isset($row->$field_name)) {
                         $default_val = $row->$field_name;
                     }
-                    
+
                     $params['data-rule-url'] = "true";
                     $out .= Form::text($field_name, $default_val, $params);
                     break;
@@ -646,7 +646,7 @@ public static function input($module, $field_name, $default_val = null, $require
             return "";
         }
     }
-    
+
     /**
      * Processes the populated values for Multiselect / Taginput / Dropdown
      * get data from module / table whichever is found if starts with '@'
@@ -657,11 +657,11 @@ public static function process_values($json)
         $out = array();
         // Check if populated values are from Module or Database Table
         if(is_string($json) && starts_with($json, "@")) {
-            
+
             // Get Module / Table Name
             $json = str_ireplace("@", "", $json);
             $table_name = strtolower(str_plural($json));
-            
+
             // Search Module
             $module = Module::getByTable($table_name);
             if(isset($module->id)) {
@@ -729,7 +729,250 @@ public static function process_values($json)
         }
         return $out;
     }
-    
+
+
+        /**
+         * Display field is CRUDs View show.blade.php with Label
+         *
+         * Uses blade syntax @la_displayField('name')
+         *
+         * @param $module Module Object
+         * @param $field_name Field Name for which display has be created
+         * @param string $class Custom css class. Default would be bootstrap 'form-control' class
+         * @return string This return html string with field display with Label
+         */
+        public static function displayField($module, $field_name, $module_name, $noformat = 'false', $class = 'form-control')
+        {
+            // Check Field View Access
+            // dd($module);
+            $submodule = Module::get($module_name);
+            $submodule->row = $module;
+            $module = $submodule;
+            // if ($module_name == 'Contacts'){
+            //
+            // }else {
+            //     echo 'test'.$module_name;
+            //     dd($module);
+            // }
+
+            if(Module::hasFieldAccess($module->id, $module->fields[$field_name]['id'], $access_type = "view")) {
+
+                $fieldObj = $module->fields[$field_name];
+                $label = $module->fields[$field_name]['label'];
+                $field_type = $module->fields[$field_name]['field_type'];
+                $field_type = ModuleFieldTypes::find($field_type);
+
+                $row = null;
+                if(isset($module->row)) {
+                    $row = $module->row;
+                }
+
+                $out = '<div class="form-group">';
+                // $out .= '<label for="' . $field_name . '" class="col-md-4 col-sm-6 col-xs-6">' . $label . ' :</label>';
+
+                $value = $row->$field_name;
+
+                switch($field_type->name) {
+                    case 'Address':
+                        if($value != "") {
+                            $value = $value . '<a target="_blank" class="pull-right btn btn-xs btn-primary btn-circle" href="http://maps.google.com/?q=' . $value . '" data-toggle="tooltip" data-placement="left" title="Check location on Map"><i class="fa fa-map-marker"></i></a>';
+                        }
+                        break;
+                    case 'Checkbox':
+                        if($value == 0) {
+                            $value = "<div class='label label-danger'>False</div>";
+                        } else {
+                            $value = "<div class='label label-success'>True</div>";
+                        }
+                        break;
+                    case 'Currency':
+
+                        break;
+                    case 'Date':
+                        if($value == NULL) {
+                            $value = "Not Available";
+                        } else {
+                            $dt = strtotime($value);
+                            $value = date("d M Y", $dt);
+                        }
+                        break;
+                    case 'Datetime':
+                        if($value == NULL) {
+                            $value = "Not Available";
+                        } else {
+                            $dt = strtotime($value);
+                            $value = date("d M Y, h:i A", $dt);
+                        }
+                        break;
+                    case 'Decimal':
+
+                        break;
+                    case 'Dropdown':
+                        $values = LAFormMaker::process_values($fieldObj['popup_vals']);
+                        if(starts_with($fieldObj['popup_vals'], "@")) {
+                            if($value != 0) {
+                                if ($noformat == 'true'){
+                                    return $values[$value];
+                                }
+                                $moduleVal = Module::getByTable(str_replace("@", "", $fieldObj['popup_vals']));
+                                if(isset($moduleVal->id)) {
+                                    $value = "<a href='" . url(config("laraadmin.adminRoute") . "/" . $moduleVal->name_db . "/" . $value) . "' class='label label-primary'>" . $values[$value] . "</a> ";
+                                } else {
+                                    $value = "<a class='label label-primary'>" . $values[$value] . "</a> ";
+                                }
+                            } else {
+                                $value = "";
+                            }
+                        }
+                        break;
+                    case 'Email':
+                        $value = '<a href="mailto:' . $value . '">' . $value . '</a>';
+                        break;
+                    case 'File':
+                        if($value != 0 && $value != "0") {
+                            $upload = \App\Models\Upload::find($value);
+                            if(isset($upload->id)) {
+                                $value = '<a class="preview" target="_blank" href="' . url("files/" . $upload->hash . DIRECTORY_SEPARATOR . $upload->name) . '">
+                                <span class="fa-stack fa-lg"><i class="fa fa-square fa-stack-2x"></i><i class="fa fa-file-o fa-stack-1x fa-inverse"></i></span> ' . $upload->name . '</a>';
+                            } else {
+                                $value = 'Uploaded file not found.';
+                            }
+                        } else {
+                            $value = 'No file';
+                        }
+                        break;
+                    case 'Files':
+                        if($value != "" && $value != "[]" && $value != "null" && starts_with($value, "[")) {
+                            $uploads = json_decode($value);
+                            $uploads_html = "";
+
+                            foreach($uploads as $uploadId) {
+                                $upload = \App\Models\Upload::find($uploadId);
+                                if(isset($upload->id)) {
+                                    $uploadIds[] = $upload->id;
+                                    $fileImage = "";
+                                    if(in_array($upload->extension, ["jpg", "png", "gif", "jpeg"])) {
+                                        $fileImage = "<img src='" . url("files/" . $upload->hash . DIRECTORY_SEPARATOR . $upload->name . "?s=90") . "'>";
+                                    } else {
+                                        $fileImage = "<i class='fa fa-file-o'></i>";
+                                    }
+                                    // $uploadImages .= "<a class='uploaded_file2' upload_id='".$upload->id."' target='_blank' href='".url("files/".$upload->hash.DIRECTORY_SEPARATOR.$upload->name)."'>".$fileImage."<i title='Remove File' class='fa fa-times'></i></a>";
+                                    $uploads_html .= '<a class="preview" target="_blank" href="' . url("files/" . $upload->hash . DIRECTORY_SEPARATOR . $upload->name) . '" data-toggle="tooltip" data-placement="top" data-container="body" style="display:inline-block;margin-right:5px;" title="' . $upload->name . '">
+                                            ' . $fileImage . '</a>';
+                                }
+                            }
+                            $value = $uploads_html;
+                        } else {
+                            $value = 'No files found.';
+                        }
+                        break;
+                    case 'Float':
+
+                        break;
+                    case 'HTML':
+                        break;
+                    case 'Image':
+                        if($value != 0 && $value != "0") {
+                            $upload = \App\Models\Upload::find($value);
+                            if(isset($upload->id)) {
+                                $value = '<a class="preview" target="_blank" href="' . url("files/" . $upload->hash . DIRECTORY_SEPARATOR . $upload->name) . '"><img src="' . url("files/" . $upload->hash . DIRECTORY_SEPARATOR . $upload->name . "?s=150") . '"></a>';
+                            } else {
+                                $value = 'Uploaded image not found.';
+                            }
+                        } else {
+                            $value = 'No Image';
+                        }
+                        break;
+                    case 'Integer':
+
+                        break;
+                    case 'Mobile':
+                        $value = '<a target="_blank" href="tel:' . $value . '">' . $value . '</a>';
+                        break;
+                    case 'Multiselect':
+                        $valueOut = "";
+                        $values = LAFormMaker::process_values($fieldObj['popup_vals']);
+                        if(count($values)) {
+                            if(starts_with($fieldObj['popup_vals'], "@")) {
+                                $moduleVal = Module::getByTable(str_replace("@", "", $fieldObj['popup_vals']));
+                                $valueSel = json_decode($value);
+                                foreach($values as $key => $val) {
+                                    if(in_array($key, $valueSel)) {
+                                        $module_link = "";
+                                        if(isset($moduleVal->id)) {
+                                            $module_link = "href='" . url(config("laraadmin.adminRoute") . "/" . $moduleVal->name_db . "/" . $key) . "'";
+                                        }
+                                        $valueOut .= "<a $module_link class='label label-primary'>" . $val . "</a> ";
+                                    }
+                                }
+                            } else {
+                                $valueSel = json_decode($value);
+                                foreach($values as $key => $val) {
+                                    if(in_array($key, $valueSel)) {
+                                        $valueOut .= "<span class='label label-primary'>" . $val . "</span> ";
+                                    }
+                                }
+                            }
+                        }
+                        $value = $valueOut;
+                        break;
+                    case 'Name':
+
+                        break;
+                    case 'Password':
+                        $value = '<a href="#" data-toggle="tooltip" data-placement="top" data-container="body" title="Cannot be declassified !!!">********</a>';
+                        break;
+                    case 'Radio':
+
+                        break;
+                    case 'String':
+
+                        break;
+                    case 'Taginput':
+                        $valueOut = "";
+                        $values = LAFormMaker::process_values($fieldObj['popup_vals']);
+                        if(count($values)) {
+                            if(starts_with($fieldObj['popup_vals'], "@")) {
+                                $moduleVal = Module::getByTable(str_replace("@", "", $fieldObj['popup_vals']));
+                                $valueSel = json_decode($value);
+                                foreach($values as $key => $val) {
+                                    if(in_array($key, $valueSel)) {
+                                        $valueOut .= "<a href='" . url(config("laraadmin.adminRoute") . "/" . $moduleVal->name_db . "/" . $key) . "' class='label label-primary'>" . $val . "</a> ";
+                                    }
+                                }
+                            } else {
+                                $valueSel = json_decode($value);
+                                foreach($valueSel as $key => $val) {
+                                    $valueOut .= "<span class='label label-primary'>" . $val . "</span> ";
+                                }
+                            }
+                        } else {
+                            $valueSel = json_decode($value);
+                            foreach($valueSel as $key => $val) {
+                                $valueOut .= "<span class='label label-primary'>" . $val . "</span> ";
+                            }
+                        }
+                        $value = $valueOut;
+                        break;
+                    case 'Textarea':
+
+                        break;
+                    case 'TextField':
+
+                        break;
+                    case 'URL':
+                        $value = '<a target="_blank" href="' . $value . '">' . $value . '</a>';
+                        break;
+                }
+
+                $out .= '<div class="col-md-8 col-sm-6 col-xs-6 fvalue">' . $value . '</div>';
+                $out .= '</div>';
+                return $value;
+            } else {
+                return "";
+            }
+        }
+
     /**
      * Display field is CRUDs View show.blade.php with Label
      *
@@ -744,22 +987,22 @@ public static function display($module, $field_name, $class = 'form-control')
     {
         // Check Field View Access
         if(Module::hasFieldAccess($module->id, $module->fields[$field_name]['id'], $access_type = "view")) {
-            
+
             $fieldObj = $module->fields[$field_name];
             $label = $module->fields[$field_name]['label'];
             $field_type = $module->fields[$field_name]['field_type'];
             $field_type = ModuleFieldTypes::find($field_type);
-            
+
             $row = null;
             if(isset($module->row)) {
                 $row = $module->row;
             }
-            
+
             $out = '<div class="form-group">';
             $out .= '<label for="' . $field_name . '" class="col-md-4 col-sm-6 col-xs-6">' . $label . ' :</label>';
-            
+
             $value = $row->$field_name;
-            
+
             switch($field_type->name) {
                 case 'Address':
                     if($value != "") {
@@ -774,7 +1017,7 @@ public static function display($module, $field_name, $class = 'form-control')
                     }
                     break;
                 case 'Currency':
-                    
+
                     break;
                 case 'Date':
                     if($value == NULL) {
@@ -793,7 +1036,7 @@ public static function display($module, $field_name, $class = 'form-control')
                     }
                     break;
                 case 'Decimal':
-                    
+
                     break;
                 case 'Dropdown':
                     $values = LAFormMaker::process_values($fieldObj['popup_vals']);
@@ -830,7 +1073,7 @@ public static function display($module, $field_name, $class = 'form-control')
                     if($value != "" && $value != "[]" && $value != "null" && starts_with($value, "[")) {
                         $uploads = json_decode($value);
                         $uploads_html = "";
-                        
+
                         foreach($uploads as $uploadId) {
                             $upload = \App\Models\Upload::find($uploadId);
                             if(isset($upload->id)) {
@@ -852,7 +1095,7 @@ public static function display($module, $field_name, $class = 'form-control')
                     }
                     break;
                 case 'Float':
-                    
+
                     break;
                 case 'HTML':
                     break;
@@ -869,7 +1112,7 @@ public static function display($module, $field_name, $class = 'form-control')
                     }
                     break;
                 case 'Integer':
-                    
+
                     break;
                 case 'Mobile':
                     $value = '<a target="_blank" href="tel:' . $value . '">' . $value . '</a>';
@@ -902,16 +1145,16 @@ public static function display($module, $field_name, $class = 'form-control')
                     $value = $valueOut;
                     break;
                 case 'Name':
-                    
+
                     break;
                 case 'Password':
                     $value = '<a href="#" data-toggle="tooltip" data-placement="top" data-container="body" title="Cannot be declassified !!!">********</a>';
                     break;
                 case 'Radio':
-                    
+
                     break;
                 case 'String':
-                    
+
                     break;
                 case 'Taginput':
                     $valueOut = "";
@@ -940,16 +1183,16 @@ public static function display($module, $field_name, $class = 'form-control')
                     $value = $valueOut;
                     break;
                 case 'Textarea':
-                    
+
                     break;
                 case 'TextField':
-                    
+
                     break;
                 case 'URL':
                     $value = '<a target="_blank" href="' . $value . '">' . $value . '</a>';
                     break;
             }
-            
+
             $out .= '<div class="col-md-8 col-sm-6 col-xs-6 fvalue">' . $value . '</div>';
             $out .= '</div>';
             return $out;
@@ -957,7 +1200,7 @@ public static function display($module, $field_name, $class = 'form-control')
             return "";
         }
     }
-    
+
     /**
      * Print complete add/edit form for Module
      *
@@ -972,6 +1215,32 @@ public static function form($module, $fields = [])
         if(count($fields) == 0) {
             $fields = array_keys($module->fields);
         }
+
+        $out = "";
+        foreach($fields as $field) {
+            // Use input method of this class to generate all Module fields
+            $out .= LAFormMaker::input($module, $field);
+        }
+        return $out;
+    }
+
+    /**
+     * Print complete add/edit form for Module
+     *
+     * Uses blade syntax @la_form($employee_module_object)
+     *
+     * @param $module Module for which add/edit form has to be created.
+     * @param array $fields List of Module Field Names to customize Selective Fields for Form
+     * @return string returns HTML for complete Module Add/Edit Form
+     */
+    public static function formMultiple($module_name, $fields = [])
+    {
+        $module = Module::get($module_name);
+        //dd($module);
+        if(count($fields) == 0) {
+            $fields = array_keys($module->fields);
+        }
+
         $out = "";
         foreach($fields as $field) {
             // Use input method of this class to generate all Module fields
@@ -979,7 +1248,7 @@ public static function form($module, $fields = [])
         }
         return $out;
     }
-    
+
     /**
      * Check Whether User has Module Access
      * Work like @if blade directive of Laravel
@@ -994,7 +1263,7 @@ public static function la_access($module_id, $access_type = "view", $user_id = 0
         // Check Module access by hasAccess method
         return Module::hasAccess($module_id, $access_type, $user_id);
     }
-    
+
     /**
      * Check Whether User has Module Field Access
      *
@@ -1011,4 +1280,4 @@ public static function la_field_access($module_id, $field_id, $access_type = "vi
         // Check Module Field access by hasFieldAccess method
         return Module::hasFieldAccess($module_id, $field_id, $access_type, $user_id);
     }
-}
\ No newline at end of file
+}
diff --git a/src/LAProvider.php b/src/LAProvider.php
index 3d475a9e..9c882aa0 100644
--- a/src/LAProvider.php
+++ b/src/LAProvider.php
@@ -45,31 +45,31 @@ public function boot()
         // Artisan::call('migrate', ['--path' => "vendor/dwij/laraadmin/src/Migrations/"]);
         //echo "Migrations completed !!!.";
         // Execute by php artisan vendor:publish --provider="Dwij\Laraadmin\LAProvider"
-        
+
         /*
         |--------------------------------------------------------------------------
         | Blade Directives for Entrust not working in Laravel 5.3
         |--------------------------------------------------------------------------
         */
-        if(LAHelper::laravel_ver() == 5.3) {
-            
+        if(LAHelper::is_recent_laravel_version()) {
+
             // Call to Entrust::hasRole
             Blade::directive('role', function ($expression) {
                 return "<?php if (\\Entrust::hasRole({$expression})) : ?>";
             });
-            
+
             // Call to Entrust::can
             Blade::directive('permission', function ($expression) {
                 return "<?php if (\\Entrust::can({$expression})) : ?>";
             });
-            
+
             // Call to Entrust::ability
             Blade::directive('ability', function ($expression) {
                 return "<?php if (\\Entrust::ability({$expression})) : ?>";
             });
         }
     }
-    
+
     /**
      * Register the application services including routes, Required Providers, Alias, Controllers, Blade Directives
      * and Commands.
@@ -79,18 +79,18 @@ public function boot()
     public function register()
     {
         include __DIR__ . '/routes.php';
-        
+
         // For LAEditor
         if(file_exists(__DIR__ . '/../../laeditor')) {
             include __DIR__ . '/../../laeditor/src/routes.php';
         }
-        
+
         /*
         |--------------------------------------------------------------------------
         | Providers
         |--------------------------------------------------------------------------
         */
-        
+
         // Collective HTML & Form Helper
         $this->app->register(\Collective\Html\HtmlServiceProvider::class);
         // For Datatables
@@ -101,91 +101,110 @@ public function register()
         $this->app->register(\Zizaco\Entrust\EntrustServiceProvider::class);
         // For Spatie Backup
         $this->app->register(\Spatie\Backup\BackupServiceProvider::class);
-        
+
         /*
         |--------------------------------------------------------------------------
         | Register the Alias
         |--------------------------------------------------------------------------
         */
-        
+
         $loader = AliasLoader::getInstance();
-        
+
         // Collective HTML & Form Helper
         $loader->alias('Form', \Collective\Html\FormFacade::class);
         $loader->alias('HTML', \Collective\Html\HtmlFacade::class);
-        
+
         // For Gravatar User Profile Pics
         $loader->alias('Gravatar', \Creativeorange\Gravatar\Facades\Gravatar::class);
-        
+
         // For LaraAdmin Code Generation
         $loader->alias('CodeGenerator', \Dwij\Laraadmin\CodeGenerator::class);
-        
+
         // For LaraAdmin Form Helper
         $loader->alias('LAFormMaker', \Dwij\Laraadmin\LAFormMaker::class);
-        
+
         // For LaraAdmin Helper
         $loader->alias('LAHelper', \Dwij\Laraadmin\Helpers\LAHelper::class);
-        
-        // LaraAdmin Module Model 
+
+        // LaraAdmin Module Model
         $loader->alias('Module', \Dwij\Laraadmin\Models\Module::class);
-        
+
         // For LaraAdmin Configuration Model
         $loader->alias('LAConfigs', \Dwij\Laraadmin\Models\LAConfigs::class);
-        
+
         // For Entrust
         $loader->alias('Entrust', \Zizaco\Entrust\EntrustFacade::class);
         $loader->alias('role', \Zizaco\Entrust\Middleware\EntrustRole::class);
         $loader->alias('permission', \Zizaco\Entrust\Middleware\EntrustPermission::class);
         $loader->alias('ability', \Zizaco\Entrust\Middleware\EntrustAbility::class);
-        
+
         /*
         |--------------------------------------------------------------------------
         | Register the Controllers
         |--------------------------------------------------------------------------
         */
-        
+
         $this->app->make('Dwij\Laraadmin\Controllers\ModuleController');
         $this->app->make('Dwij\Laraadmin\Controllers\FieldController');
         $this->app->make('Dwij\Laraadmin\Controllers\MenuController');
-        
+
         // For LAEditor
         if(file_exists(__DIR__ . '/../../laeditor')) {
             $this->app->make('Dwij\Laeditor\Controllers\CodeEditorController');
         }
-        
+
         /*
         |--------------------------------------------------------------------------
         | Blade Directives
         |--------------------------------------------------------------------------
         */
-        
+
         // LAForm Input Maker
         Blade::directive('la_input', function ($expression) {
-            if(LAHelper::laravel_ver() == 5.3) {
+            if(LAHelper::is_recent_laravel_version()) {
                 $expression = "(" . $expression . ")";
             }
             return "<?php echo LAFormMaker::input$expression; ?>";
         });
-        
+
         // LAForm Form Maker
         Blade::directive('la_form', function ($expression) {
-            if(LAHelper::laravel_ver() == 5.3) {
+            if(LAHelper::is_recent_laravel_version()) {
                 $expression = "(" . $expression . ")";
             }
             return "<?php echo LAFormMaker::form$expression; ?>";
         });
-        
+
+        // LAForm Form Maker Multiple
+        Blade::directive('la_formMultiple', function ($expression) {
+            if(LAHelper::is_recent_laravel_version()) {
+                $expression = "(" . $expression . ")";
+            }
+            return "<?php echo LAFormMaker::formMultiple$expression; ?>";
+        });
+
         // LAForm Maker - Display Values
         Blade::directive('la_display', function ($expression) {
-            if(LAHelper::laravel_ver() == 5.3) {
+            if(LAHelper::is_recent_laravel_version()) {
                 $expression = "(" . $expression . ")";
             }
             return "<?php echo LAFormMaker::display$expression; ?>";
         });
-        
+
+        // LAForm Maker - Display Values
+        Blade::directive('la_displayField', function ($expression) {
+            if(LAHelper::is_recent_laravel_version()) {
+                $expression = "(" . $expression . ")";
+            }
+            return "<?php echo LAFormMaker::displayField$expression; ?>";
+        });
+
+        Blade::directive('public', function () {
+                    return "<?php if (app('context')->isPublic()): ?>";
+                });
         // LAForm Maker - Check Whether User has Module Access
         Blade::directive('la_access', function ($expression) {
-            if(LAHelper::laravel_ver() == 5.3) {
+            if(LAHelper::is_recent_laravel_version()) {
                 $expression = "(" . $expression . ")";
             }
             return "<?php if(LAFormMaker::la_access$expression) { ?>";
@@ -193,10 +212,10 @@ public function register()
         Blade::directive('endla_access', function ($expression) {
             return "<?php } ?>";
         });
-        
+
         // LAForm Maker - Check Whether User has Module Field Access
         Blade::directive('la_field_access', function ($expression) {
-            if(LAHelper::laravel_ver() == 5.3) {
+            if(LAHelper::is_recent_laravel_version()) {
                 $expression = "(" . $expression . ")";
             }
             return "<?php if(LAFormMaker::la_field_access$expression) { ?>";
@@ -204,25 +223,25 @@ public function register()
         Blade::directive('endla_field_access', function ($expression) {
             return "<?php } ?>";
         });
-        
+
         /*
         |--------------------------------------------------------------------------
         | Register the Commands
         |--------------------------------------------------------------------------
         */
-        
+
         $commands = [
             \Dwij\Laraadmin\Commands\Migration::class,
             \Dwij\Laraadmin\Commands\Crud::class,
             \Dwij\Laraadmin\Commands\Packaging::class,
             \Dwij\Laraadmin\Commands\LAInstall::class
         ];
-        
+
         // For LAEditor
         if(file_exists(__DIR__ . '/../../laeditor')) {
             $commands[] = \Dwij\Laeditor\Commands\LAEditor::class;
         }
-        
+
         $this->commands($commands);
     }
 }
diff --git a/src/Models/Module.php b/src/Models/Module.php
index 1a63b6ce..b7b56e74 100644
--- a/src/Models/Module.php
+++ b/src/Models/Module.php
@@ -28,15 +28,15 @@
 class Module extends Model
 {
     protected $table = 'modules';
-    
+
     protected $fillable = [
         "name", "name_db", "label", "view_col", "model", "controller", "is_gen", "fa_icon"
     ];
-    
+
     protected $hidden = [
-    
+
     ];
-    
+
     /**
      * Generates Module Base by taking Module Name and Module FontAwesome Icon
      * It firstly checks if Module is already generated or not then
@@ -48,9 +48,9 @@ class Module extends Model
      */
     public static function generateBase($module_name, $icon)
     {
-        
+
         $names = LAHelper::generateModuleNames($module_name, $icon);
-        
+
         // Check is Generated
         $is_gen = false;
         if(file_exists(base_path('app/Http/Controllers/' . ($names->controller) . ".php"))) {
@@ -71,12 +71,12 @@ public static function generateBase($module_name, $icon)
                 'controller' => $names->controller,
                 'fa_icon' => $names->fa_icon,
                 'is_gen' => $is_gen,
-            
+
             ]);
         }
         return $module->id;
     }
-    
+
     /**
      * This function handles Module Migration via "Module::generate()" call from migrations file.
      * This creates all given Module fields into database.
@@ -90,10 +90,10 @@ public static function generateBase($module_name, $icon)
      */
     public static function generate($module_name, $module_name_db, $view_col, $faIcon = "fa-cube", $fields)
     {
-        
+
         $names = LAHelper::generateModuleNames($module_name, $faIcon);
         $fields = Module::format_fields($module_name, $fields);
-        
+
         if(substr_count($view_col, " ") || substr_count($view_col, ".")) {
             throw new Exception("Unable to generate migration for " . ($names->module) . " : Invalid view_column_name. 'This should be database friendly lowercase name.'", 1);
         } else if(!Module::validate_view_column($fields, $view_col)) {
@@ -108,7 +108,7 @@ public static function generate($module_name, $module_name_db, $view_col, $faIco
                     $is_gen = true;
                 }
             }
-            
+
             // Create Module if not exists
             $module = Module::where('name', $names->module)->first();
             if(!isset($module->id)) {
@@ -123,25 +123,25 @@ public static function generate($module_name, $module_name_db, $view_col, $faIco
                     'fa_icon' => $faIcon
                 ]);
             }
-            
+
             $ftypes = ModuleFieldTypes::getFTypes();
             //print_r($ftypes);
             //print_r($module);
             //print_r($fields);
-            
+
             // Create Database Schema for table
             Schema::create($names->table, function (Blueprint $table) use ($fields, $module, $ftypes) {
                 $table->increments('id');
                 foreach($fields as $field) {
-                    
+
                     $mod = ModuleFields::where('module', $module->id)->where('colname', $field->colname)->first();
                     if(!isset($mod->id)) {
                         if($field->field_type == "Multiselect" || $field->field_type == "Taginput") {
-                            
+
                             if(is_string($field->defaultvalue) && starts_with($field->defaultvalue, "[")) {
                                 $field->defaultvalue = json_decode($field->defaultvalue);
                             }
-                            
+
                             if(is_string($field->defaultvalue) || is_int($field->defaultvalue)) {
                                 $dvalue = json_encode([$field->defaultvalue]);
                             } else {
@@ -155,12 +155,12 @@ public static function generate($module_name, $module_name_db, $view_col, $faIco
                                 $dvalue = json_encode($field->defaultvalue);
                             }
                         }
-                        
+
                         $pvalues = $field->popup_vals;
                         if(is_array($field->popup_vals) || is_object($field->popup_vals)) {
                             $pvalues = json_encode($field->popup_vals);
                         }
-                        
+
                         // Create Module field Metadata / Context
                         $field_obj = ModuleFields::create([
                             'module' => $module->id,
@@ -178,11 +178,11 @@ public static function generate($module_name, $module_name_db, $view_col, $faIco
                         $field->id = $field_obj->id;
                         $field->module_obj = $module;
                     }
-                    
+
                     // Create Module field schema in database
                     Module::create_field_schema($table, $field);
                 }
-                
+
                 // $table->string('name');
                 // $table->string('designation', 100);
                 // $table->string('mobile', 20);
@@ -206,7 +206,7 @@ public static function generate($module_name, $module_name_db, $view_col, $faIco
             });
         }
     }
-    
+
     /**
      * Validates if given view_column_name exists in fields array
      *
@@ -225,7 +225,7 @@ public static function validate_view_column($fields, $view_col)
         }
         return $found;
     }
-    
+
     /**
      * Method creates database table field via $table variable from Schema
      * @param $table
@@ -246,7 +246,7 @@ public static function create_field_schema($table, $field, $update = false, $isF
         }
         // Log::debug('Module:create_field_schema ('.$update.') - '.$field->colname." - ".$field->field_type
         // ." - ".$defval." - ".$field->maxlength);
-        
+
         // Create Field in Database for respective Field Type
         switch($field->field_type) {
             case 'Address':
@@ -307,7 +307,7 @@ public static function create_field_schema($table, $field, $update = false, $isF
                 } else {
                     $var = $table->date($field->colname)->nullable();
                 }
-                
+
                 if($field->defaultvalue == NULL || $field->defaultvalue == "" || $field->defaultvalue == "NULL") {
                     $var->default(NULL);
                 } else if($field->defaultvalue == "now()") {
@@ -685,7 +685,7 @@ public static function create_field_schema($table, $field, $update = false, $isF
                 if(is_string($field->defaultvalue) && starts_with($field->defaultvalue, "[")) {
                     $field->defaultvalue = json_decode($field->defaultvalue);
                 }
-                
+
                 if(is_string($field->defaultvalue)) {
                     $field->defaultvalue = json_encode([$field->defaultvalue]);
                     //echo "string: ".$field->defaultvalue;
@@ -762,7 +762,7 @@ public static function create_field_schema($table, $field, $update = false, $isF
                 }
                 break;
         }
-        
+
         // set column unique
         if($update) {
             if($isFieldTypeChange) {
@@ -776,7 +776,7 @@ public static function create_field_schema($table, $field, $update = false, $isF
             }
         }
     }
-    
+
     /**
      * This method process and alters user created migration fields array to fit into standard field Context / Metedata
      *
@@ -798,7 +798,7 @@ public static function format_fields($module_name, $fields)
             // Check if field format is New
             if(LAHelper::is_assoc_array($field)) {
                 $obj = (object)$field;
-                
+
                 if(!isset($obj->colname)) {
                     throw new Exception("Migration " . $module_name . " -  Field does not have colname", 1);
                 } else if(!isset($obj->label)) {
@@ -837,7 +837,7 @@ public static function format_fields($module_name, $fields)
                         $obj->listing_col = 0;
                     }
                 }
-                
+
                 if(!isset($obj->popup_vals)) {
                     $obj->popup_vals = "";
                 } else {
@@ -855,7 +855,7 @@ public static function format_fields($module_name, $fields)
                 $obj->colname = $field[0];
                 $obj->label = $field[1];
                 $obj->field_type = $field[2];
-                
+
                 if(!isset($field[3])) {
                     $obj->unique = 0;
                 } else {
@@ -887,7 +887,7 @@ public static function format_fields($module_name, $fields)
                     $obj->required = $field[7];
                 }
                 $obj->listing_col = 1;
-                
+
                 if(!isset($field[8])) {
                     $obj->popup_vals = "";
                 } else {
@@ -902,7 +902,7 @@ public static function format_fields($module_name, $fields)
         }
         return $out;
     }
-    
+
     /**
      * Get Module Object by passing Module Name / id
      * It also includes array of Module fields
@@ -920,7 +920,7 @@ public static function get($module_name)
         } else {
             $module = Module::where('name', $module_name)->orWhere('name_db', $module_name)->first();
         }
-        
+
         // If Module is found in database also attach its field array to it.
         if(isset($module)) {
             $module = $module->toArray();
@@ -935,7 +935,7 @@ public static function get($module_name)
             return null;
         }
     }
-    
+
     /**
      * Get Module by table name
      *
@@ -954,7 +954,7 @@ public static function getByTable($table_name)
             return null;
         }
     }
-    
+
     /**
      * Get Array of Values for Dropdown, Multiselect, Taginput, Radio from Module
      *
@@ -973,7 +973,7 @@ public static function getDDArray($module_name)
             } else {
                 $model = "App\\Models\\" . ucfirst(str_singular($module_name));
             }
-            
+
             $result = $model::all();
             $out = array();
             foreach($result as $row) {
@@ -985,7 +985,7 @@ public static function getDDArray($module_name)
             return array();
         }
     }
-    
+
     /**
      * Create Validations rules array for Laravel Validations using Module Field Context / Metadata
      * Used in LaraAdmin generated Controllers for store and update.
@@ -1038,7 +1038,7 @@ public static function validateRules($module_name, $request, $isEdit = false)
             return $rules;
         }
     }
-    
+
     /**
      * This method saves data from Request to Database.
      *
@@ -1056,7 +1056,7 @@ public static function insert($module_name, $request)
             } else {
                 $model = "App\\Models\\" . ucfirst(str_singular($module_name));
             }
-            
+
             // Delete if unique rows available which are deleted
             $old_row = null;
             $uniqueFields = ModuleFields::where('module', $module->id)->where('unique', '1')->get()->toArray();
@@ -1068,7 +1068,7 @@ public static function insert($module_name, $request)
                     DB::table($module->name_db)->whereNotNull('deleted_at')->where($field['colname'], $request->{$field['colname']})->delete();
                 }
             }
-            
+
             $row = new $model;
             if(isset($old_row->id)) {
                 // To keep old & new row id remain same
@@ -1081,7 +1081,7 @@ public static function insert($module_name, $request)
             return null;
         }
     }
-    
+
     /**
      * This method updates data from Request to Database for given Module and Row Id
      *
@@ -1093,6 +1093,7 @@ public static function insert($module_name, $request)
     public static function updateRow($module_name, $request, $id)
     {
         $module = Module::get($module_name);
+        //dd($request->all());
         if(isset($module)) {
             $model_name = ucfirst(str_singular($module_name));
             if($model_name == "User" || $model_name == "Role" || $model_name == "Permission") {
@@ -1109,7 +1110,7 @@ public static function updateRow($module_name, $request, $id)
             return null;
         }
     }
-    
+
     /**
      * Process Row Data According to its Field Type & Context / Metadata
      * Helps to save and update database records
@@ -1122,10 +1123,10 @@ public static function updateRow($module_name, $request, $id)
     public static function processDBRow($module, $request, $row)
     {
         $ftypes = ModuleFieldTypes::getFTypes2();
-        
+
         foreach($module->fields as $field) {
             if(isset($request->{$field['colname']}) || isset($request->{$field['colname'] . "_hidden"})) {
-                
+
                 switch($ftypes[$field['field_type']]) {
                     case 'Checkbox':
                         if(isset($request->{$field['colname']})) {
@@ -1197,7 +1198,7 @@ public static function processDBRow($module, $request, $row)
         }
         return $row;
     }
-    
+
     /**
      * Count Number of rows in Table of given Module
      *
@@ -1228,7 +1229,7 @@ public static function itemCount($module_name)
             return -1;
         }
     }
-    
+
     /**
      * Get Module Access for all roles or specific role
      *
@@ -1242,23 +1243,23 @@ public static function getRoleAccess($module_id, $specific_role = 0)
     {
         $module = Module::find($module_id);
         $module = Module::get($module->name);
-        
+
         if($specific_role) {
             $roles_arr = DB::table('roles')->where('id', $specific_role)->get();
         } else {
             $roles_arr = DB::table('roles')->get();
         }
         $roles = array();
-        
+
         $arr_field_access = array(
             'invisible' => 0,
             'readonly' => 1,
             'write' => 2
         );
-        
+
         foreach($roles_arr as $role) {
             // get Current Module permissions for this role
-            
+
             $module_perm = DB::table('role_module')->where('role_id', $role->id)->where('module_id', $module->id)->first();
             if(isset($module_perm->id)) {
                 // set db values
@@ -1272,14 +1273,14 @@ public static function getRoleAccess($module_id, $specific_role = 0)
                 $role->edit = false;
                 $role->delete = false;
             }
-            
+
             // get Current Module Fields permissions for this role
-            
+
             $role->fields = array();
             foreach($module->fields as $field) {
                 // find role field permission
                 $field_perm = DB::table('role_module_fields')->where('role_id', $role->id)->where('field_id', $field['id'])->first();
-                
+
                 if(isset($field_perm->id)) {
                     $field['access'] = $arr_field_access[$field_perm->access];
                 } else {
@@ -1292,7 +1293,7 @@ public static function getRoleAccess($module_id, $specific_role = 0)
         }
         return $roles;
     }
-    
+
     /**
      * Get Specific Module Access for login user or specific user ($user_id)
      *
@@ -1306,16 +1307,16 @@ public static function getRoleAccess($module_id, $specific_role = 0)
     public static function hasAccess($module_id, $access_type = "view", $user_id = 0)
     {
         $roles = array();
-        
+
         if(is_string($module_id)) {
             $module = Module::get($module_id);
             $module_id = $module->id;
         }
-        
+
         if($access_type == null || $access_type == "") {
             $access_type = "view";
         }
-        
+
         if($user_id) {
             $user = \App\User::find($user_id);
             if(isset($user->id)) {
@@ -1338,7 +1339,7 @@ public static function hasAccess($module_id, $access_type = "view", $user_id = 0
         }
         return false;
     }
-    
+
     /**
      * Get Module Field Access for role and access type
      *
@@ -1353,27 +1354,27 @@ public static function hasAccess($module_id, $access_type = "view", $user_id = 0
     public static function hasFieldAccess($module_id, $field_id, $access_type = "view", $user_id = 0)
     {
         $roles = array();
-        
+
         // \Log::debug("module_id: ".$module_id." field_id: ".$field_id." access_type: ".$access_type);
-        
+
         if(\Auth::guest()) {
             return false;
         }
-        
+
         if(is_string($module_id)) {
             $module = Module::get($module_id);
             $module_id = $module->id;
         }
-        
+
         if(is_string($field_id)) {
             $field_object = ModuleFields::where('module', $module_id)->where('colname', $field_id)->first();
             $field_id = $field_object->id;
         }
-        
+
         if($access_type == null || $access_type == "") {
             $access_type = "view";
         }
-        
+
         if($user_id) {
             $user = \App\User::find($user_id);
             if(isset($user->id)) {
@@ -1382,9 +1383,9 @@ public static function hasFieldAccess($module_id, $field_id, $access_type = "vie
         } else {
             $roles = \Auth::user()->roles();
         }
-        
+
         $hasModuleAccess = false;
-        
+
         foreach($roles->get() as $role) {
             $module_perm = DB::table('role_module')->where('role_id', $role->id)->where('module_id', $module_id)->first();
             if(isset($module_perm->id)) {
@@ -1419,7 +1420,7 @@ public static function hasFieldAccess($module_id, $field_id, $access_type = "vie
         }
         return false;
     }
-    
+
     /**
      * Set Default Access for given Module and Role
      * Helps to set Full Module Access for Super Admin
@@ -1434,46 +1435,46 @@ public static function setDefaultRoleAccess($module_id, $role_id, $access_type =
     {
         $module = Module::find($module_id);
         $module = Module::get($module->name);
-        
+
         // Log::debug('Module:setDefaultRoleAccess ('.$module_id.', '.$role_id.', '.$access_type.')');
-        
+
         $role = DB::table('roles')->where('id', $role_id)->first();
-        
+
         $access_view = 0;
         $access_create = 0;
         $access_edit = 0;
         $access_delete = 0;
         $access_fields = "invisible";
-        
+
         if($access_type == "full") {
             $access_view = 1;
             $access_create = 1;
             $access_edit = 1;
             $access_delete = 1;
             $access_fields = "write";
-            
+
         } else if($access_type == "readonly") {
             $access_view = 1;
             $access_create = 0;
             $access_edit = 0;
             $access_delete = 0;
-            
+
             $access_fields = "readonly";
         }
-        
+
         $now = date("Y-m-d H:i:s");
-        
+
         // 1. Set Module Access
-        
+
         $module_perm = DB::table('role_module')->where('role_id', $role->id)->where('module_id', $module->id)->first();
         if(!isset($module_perm->id)) {
             DB::insert('insert into role_module (role_id, module_id, acc_view, acc_create, acc_edit, acc_delete, created_at, updated_at) values (?, ?, ?, ?, ?, ?, ?, ?)', [$role->id, $module->id, $access_view, $access_create, $access_edit, $access_delete, $now, $now]);
         } else {
             DB::table('role_module')->where('role_id', $role->id)->where('module_id', $module->id)->update(['acc_view' => $access_view, 'acc_create' => $access_create, 'acc_edit' => $access_edit, 'acc_delete' => $access_delete]);
         }
-        
+
         // 2. Set Module Fields Access
-        
+
         foreach($module->fields as $field) {
             // find role field permission
             $field_perm = DB::table('role_module_fields')->where('role_id', $role->id)->where('field_id', $field['id'])->first();
@@ -1484,7 +1485,7 @@ public static function setDefaultRoleAccess($module_id, $role_id, $access_type =
             }
         }
     }
-    
+
     /**
      * Set Default Access for given Module Field and Role
      * Helps to set Full Module Access for Super Admin when new field is created
@@ -1499,20 +1500,20 @@ public static function setDefaultFieldRoleAccess($field_id, $role_id, $access_ty
     {
         $field = ModuleFields::find($field_id);
         $module = Module::get($field->module);
-        
+
         $role = DB::table('roles')->where('id', $role_id)->first();
-        
+
         $access_fields = "invisible";
-        
+
         if($access_type == "full") {
             $access_fields = "write";
-            
+
         } else if($access_type == "readonly") {
             $access_fields = "readonly";
         }
-        
+
         $now = date("Y-m-d H:i:s");
-        
+
         // find role field permission
         $field_perm = DB::table('role_module_fields')->where('role_id', $role->id)->where('field_id', $field->id)->first();
         if(!isset($field_perm->id)) {
@@ -1521,7 +1522,7 @@ public static function setDefaultFieldRoleAccess($field_id, $role_id, $access_ty
             DB::table('role_module_fields')->where('role_id', $role->id)->where('field_id', $field->id)->update(['access' => $access_fields]);
         }
     }
-    
+
     /**
      * Get list of Columns to display in Index Page for a particular Module
      * Also Filters the columns for Access control
@@ -1541,7 +1542,7 @@ public static function getListingColumns($module_id_name, $isObjects = false)
             $module = Module::where('name', $module_id_name)->first();
         }
         $listing_cols = ModuleFields::where('module', $module->id)->where('listing_col', 1)->orderBy('sort', 'asc')->get()->toArray();
-        
+
         if($isObjects) {
             $id_col = array('label' => 'id', 'colname' => 'id');
         } else {
diff --git a/src/routes.php b/src/routes.php
index 551f9f20..1f8db135 100644
--- a/src/routes.php
+++ b/src/routes.php
@@ -1,7 +1,7 @@
 <?php
 
 $as = "";
-if(\Dwij\Laraadmin\Helpers\LAHelper::laravel_ver() == 5.3) {
+if(\Dwij\Laraadmin\Helpers\LAHelper::is_recent_laravel_version()) {
     $as = config('laraadmin.adminRoute') . '.';
 }
 
diff --git a/src/stubs/controller.stub b/src/stubs/controller.stub
index de8d2fc9..dca12baf 100644
--- a/src/stubs/controller.stub
+++ b/src/stubs/controller.stub
@@ -19,13 +19,14 @@ use Datatables;
 use Collective\Html\FormFacade as Form;
 use Dwij\Laraadmin\Models\Module;
 use Dwij\Laraadmin\Models\ModuleFields;
+use Dwij\Laraadmin\Models\ModuleFieldTypes;
 
 use App\Models\__model_name__;
 
 class __controller_class_name__ extends Controller
 {
     public $show_action = true;
-    
+
     /**
      * Display a listing of the __module_name__.
      *
@@ -34,7 +35,7 @@ class __controller_class_name__ extends Controller
     public function index()
     {
         $module = Module::get('__module_name__');
-        
+
         if(Module::hasAccess($module->id)) {
             return View('la.__view_folder__.index', [
                 'show_actions' => $this->show_action,
@@ -45,7 +46,7 @@ class __controller_class_name__ extends Controller
             return redirect(config('laraadmin.adminRoute') . "/");
         }
     }
-    
+
     /**
      * Show the form for creating a new __singular_var__.
      *
@@ -55,7 +56,7 @@ class __controller_class_name__ extends Controller
     {
         //
     }
-    
+
     /**
      * Store a newly created __singular_var__ in database.
      *
@@ -65,24 +66,24 @@ class __controller_class_name__ extends Controller
     public function store(Request $request)
     {
         if(Module::hasAccess("__module_name__", "create")) {
-            
+
             $rules = Module::validateRules("__module_name__", $request);
-            
+
             $validator = Validator::make($request->all(), $rules);
-            
+
             if($validator->fails()) {
                 return redirect()->back()->withErrors($validator)->withInput();
             }
-            
+
             $insert_id = Module::insert("__module_name__", $request);
-            
+
             return redirect()->route(config('laraadmin.adminRoute') . '.__route_resource__.index');
-            
+
         } else {
             return redirect(config('laraadmin.adminRoute') . "/");
         }
     }
-    
+
     /**
      * Display the specified __singular_var__.
      *
@@ -92,12 +93,12 @@ class __controller_class_name__ extends Controller
     public function show($id)
     {
         if(Module::hasAccess("__module_name__", "view")) {
-            
+
             $__singular_var__ = __model_name__::find($id);
             if(isset($__singular_var__->id)) {
                 $module = Module::get('__module_name__');
                 $module->row = $__singular_var__;
-                
+
                 return view('la.__view_folder__.show', [
                     'module' => $module,
                     'view_col' => $module->view_col,
@@ -114,7 +115,7 @@ class __controller_class_name__ extends Controller
             return redirect(config('laraadmin.adminRoute') . "/");
         }
     }
-    
+
     /**
      * Show the form for editing the specified __singular_var__.
      *
@@ -127,9 +128,9 @@ class __controller_class_name__ extends Controller
             $__singular_var__ = __model_name__::find($id);
             if(isset($__singular_var__->id)) {
                 $module = Module::get('__module_name__');
-                
+
                 $module->row = $__singular_var__;
-                
+
                 return view('la.__view_folder__.edit', [
                     'module' => $module,
                     'view_col' => $module->view_col,
@@ -144,7 +145,7 @@ class __controller_class_name__ extends Controller
             return redirect(config('laraadmin.adminRoute') . "/");
         }
     }
-    
+
     /**
      * Update the specified __singular_var__ in storage.
      *
@@ -155,24 +156,24 @@ class __controller_class_name__ extends Controller
     public function update(Request $request, $id)
     {
         if(Module::hasAccess("__module_name__", "edit")) {
-            
+
             $rules = Module::validateRules("__module_name__", $request, true);
-            
+
             $validator = Validator::make($request->all(), $rules);
-            
+
             if($validator->fails()) {
                 return redirect()->back()->withErrors($validator)->withInput();;
             }
-            
+
             $insert_id = Module::updateRow("__module_name__", $request, $id);
-            
+
             return redirect()->route(config('laraadmin.adminRoute') . '.__route_resource__.index');
-            
+
         } else {
             return redirect(config('laraadmin.adminRoute') . "/");
         }
     }
-    
+
     /**
      * Remove the specified __singular_var__ from storage.
      *
@@ -183,14 +184,14 @@ class __controller_class_name__ extends Controller
     {
         if(Module::hasAccess("__module_name__", "delete")) {
             __model_name__::find($id)->delete();
-            
+
             // Redirecting to index() method
             return redirect()->route(config('laraadmin.adminRoute') . '.__route_resource__.index');
         } else {
             return redirect(config('laraadmin.adminRoute') . "/");
         }
     }
-    
+
     /**
      * Server side Datatable fetch via Ajax
      *
@@ -201,18 +202,35 @@ class __controller_class_name__ extends Controller
     {
         $module = Module::get('__module_name__');
         $listing_cols = Module::getListingColumns('__module_name__');
-        
+
         $values = DB::table('__db_table_name__')->select($listing_cols)->whereNull('deleted_at');
         $out = Datatables::of($values)->make();
         $data = $out->getData();
-        
+
         $fields_popup = ModuleFields::getModuleFields('__module_name__');
-        
+
         for($i = 0; $i < count($data->data); $i++) {
             for($j = 0; $j < count($listing_cols); $j++) {
                 $col = $listing_cols[$j];
                 if($fields_popup[$col] != null && starts_with($fields_popup[$col]->popup_vals, "@")) {
-                    $data->data[$i][$j] = ModuleFields::getFieldValue($fields_popup[$col], $data->data[$i][$j]);
+                    //slam_modifie_start
+                    $field_type = ModuleFieldTypes::find($fields_popup[$col]->field_type);
+                    switch($field_type->name) {
+                        case 'Multiselect':
+                            $multiValues = ModuleFields::getFieldValue($fields_popup[$col], $data->data[$i][$j]);
+                            $multiValues = str_replace(['[', ']', '"'], '', $multiValues);
+                            $multiValues = explode(",", $multiValues);
+                            $value = '';
+                            foreach($multiValues as $multiValue) {
+                                $value .= " <span class = 'label label-default'>".ModuleFields::getFieldValue($fields_popup[$col], $multiValue)."</span>";
+                            }
+
+                            $data->data[$i][$j] = $value;
+                            break;
+                        default:
+                            $data->data[$i][$j] = ModuleFields::getFieldValue($fields_popup[$col], $data->data[$i][$j]);
+                    }
+                    //slam_modifie_stop
                 }
                 if($col == $module->view_col) {
                     $data->data[$i][$j] = '<a href="' . url(config('laraadmin.adminRoute') . '/__route_resource__/' . $data->data[$i][0]) . '">' . $data->data[$i][$j] . '</a>';
@@ -221,13 +239,13 @@ class __controller_class_name__ extends Controller
                 //    $data->data[$i][$j];
                 // }
             }
-            
+
             if($this->show_action) {
                 $output = '';
                 if(Module::hasAccess("__module_name__", "edit")) {
                     $output .= '<a href="' . url(config('laraadmin.adminRoute') . '/__route_resource__/' . $data->data[$i][0] . '/edit') . '" class="btn btn-warning btn-xs" style="display:inline;padding:2px 5px 3px 5px;"><i class="fa fa-edit"></i></a>';
                 }
-                
+
                 if(Module::hasAccess("__module_name__", "delete")) {
                     $output .= Form::open(['route' => [config('laraadmin.adminRoute') . '.__route_resource__.destroy', $data->data[$i][0]], 'method' => 'delete', 'style' => 'display:inline']);
                     $output .= ' <button class="btn btn-danger btn-xs" type="submit"><i class="fa fa-times"></i></button>';
diff --git a/src/stubs/views/index.blade.stub b/src/stubs/views/index.blade.stub
index fa6961bc..554573bf 100644
--- a/src/stubs/views/index.blade.stub
+++ b/src/stubs/views/index.blade.stub
@@ -8,7 +8,7 @@
 
 @section("headerElems")
 @la_access("__module_name__", "create")
-    <button class="btn btn-success btn-sm pull-right" data-toggle="modal" data-target="#AddModal">Add __singular_cap_var__</button>
+    <button class="btn btn-success btn-sm pull-right" data-toggle="modal" data-target="#AddModal">{{ __('Add __singular_cap_var__') }}</button>
 @endla_access
 @endsection
 
@@ -31,15 +31,19 @@
         <thead>
         <tr class="success">
             @foreach( $listing_cols as $col )
-            <th>{{ $module->fields[$col]['label'] or ucfirst($col) }}</th>
+                @if ($col === 'id')
+                    <th>{{ $module->fields[$col]['label'] or __(ucfirst($col)) }}</th>
+                @else
+                    <th>{{ __($module->fields[$col]['label']) }}</th>
+                @endif
             @endforeach
             @if($show_actions)
-            <th>Actions</th>
+            <th>{{ __('Actions') }}</th>
             @endif
         </tr>
         </thead>
         <tbody>
-            
+
         </tbody>
         </table>
     </div>
@@ -51,20 +55,20 @@
         <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">Add __singular_cap_var__</h4>
+                <h4 class="modal-title" id="myModalLabel">{{ __('Add __singular_cap_var__') }}</h4>
             </div>
             {!! Form::open(['action' => 'LA\__controller_class_name__@store', 'id' => '__singular_var__-add-form']) !!}
             <div class="modal-body">
                 <div class="box-body">
                     @la_form($module)
-                    
+
                     {{--
                     __input_fields__
                     --}}
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">{{ __('Close') }}</button>
                 {!! Form::submit( 'Submit', ['class'=>'btn btn-success']) !!}
             </div>
             {!! Form::close() !!}
@@ -97,7 +101,7 @@ $(function () {
         @endif
     });
     $("#__singular_var__-add-form").validate({
-        
+
     });
 });
 </script>