diff --git a/composer.json b/composer.json
index 65cd848ca..1b7789e9d 100755
--- a/composer.json
+++ b/composer.json
@@ -71,10 +71,6 @@
         }
     },
     "autoload": {
-        "classmap": [
-            "database/seeds",
-            "database/factories"
-        ],
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 5e1f0c968..d4ee6d404 100755
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Database\Factories;
+
+use Faker\Generator as Faker;
+use Illuminate\Support\Str;
 use jeremykenedy\LaravelRoles\Models\Role;
 
 /*
@@ -26,7 +30,7 @@
         'password'                       => $password ?: $password = bcrypt('secret'),
         'token'                          => str_random(64),
         'activated'                      => true,
-        'remember_token'                 => str_random(10),
+        'remember_token'                 => Str::random(10),
         'signup_ip_address'              => $faker->ipv4,
         'signup_confirmation_ip_address' => $faker->ipv4,
     ];
diff --git a/database/seeds/BlockedItemsTableSeeder.php b/database/seeders/BlockedItemsTableSeeder.php
similarity index 98%
rename from database/seeds/BlockedItemsTableSeeder.php
rename to database/seeders/BlockedItemsTableSeeder.php
index f1cd50124..94a12b520 100644
--- a/database/seeds/BlockedItemsTableSeeder.php
+++ b/database/seeders/BlockedItemsTableSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Seeds;
+namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
 use jeremykenedy\LaravelBlocker\App\Models\BlockedItem;
diff --git a/database/seeds/BlockedTypeTableSeeder.php b/database/seeders/BlockedTypeTableSeeder.php
similarity index 98%
rename from database/seeds/BlockedTypeTableSeeder.php
rename to database/seeders/BlockedTypeTableSeeder.php
index 4fc0c16f1..de8b6c284 100644
--- a/database/seeds/BlockedTypeTableSeeder.php
+++ b/database/seeders/BlockedTypeTableSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Seeds;
+namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
 use jeremykenedy\LaravelBlocker\App\Models\BlockedType;
diff --git a/database/seeds/ConnectRelationshipsSeeder.php b/database/seeders/ConnectRelationshipsSeeder.php
similarity index 95%
rename from database/seeds/ConnectRelationshipsSeeder.php
rename to database/seeders/ConnectRelationshipsSeeder.php
index 08ec977ff..ff3c9956b 100755
--- a/database/seeds/ConnectRelationshipsSeeder.php
+++ b/database/seeders/ConnectRelationshipsSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class ConnectRelationshipsSeeder extends Seeder
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
similarity index 94%
rename from database/seeds/DatabaseSeeder.php
rename to database/seeders/DatabaseSeeder.php
index 170b0e170..1bb7895b8 100755
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Seeders;
+
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
 
diff --git a/database/seeds/PermissionsTableSeeder.php b/database/seeders/PermissionsTableSeeder.php
similarity index 98%
rename from database/seeds/PermissionsTableSeeder.php
rename to database/seeders/PermissionsTableSeeder.php
index 41ad844d7..059337883 100755
--- a/database/seeds/PermissionsTableSeeder.php
+++ b/database/seeders/PermissionsTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class PermissionsTableSeeder extends Seeder
diff --git a/database/seeds/RolesTableSeeder.php b/database/seeders/RolesTableSeeder.php
similarity index 98%
rename from database/seeds/RolesTableSeeder.php
rename to database/seeders/RolesTableSeeder.php
index 65c83ce27..f5583307a 100755
--- a/database/seeds/RolesTableSeeder.php
+++ b/database/seeders/RolesTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class RolesTableSeeder extends Seeder
diff --git a/database/seeds/ThemesTableSeeder.php b/database/seeders/ThemesTableSeeder.php
similarity index 99%
rename from database/seeds/ThemesTableSeeder.php
rename to database/seeders/ThemesTableSeeder.php
index ebaed57c7..3fda5ca0a 100755
--- a/database/seeds/ThemesTableSeeder.php
+++ b/database/seeders/ThemesTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Seeders;
+
 use App\Models\Theme;
 use Illuminate\Database\Seeder;
 
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php
similarity index 72%
rename from database/seeds/UsersTableSeeder.php
rename to database/seeders/UsersTableSeeder.php
index ff07dc19e..58f4a7b4c 100755
--- a/database/seeds/UsersTableSeeder.php
+++ b/database/seeders/UsersTableSeeder.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace Database\Seeders;
+
 use App\Models\Profile;
 use App\Models\User;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Hash;
 use jeremykenedy\LaravelRoles\Models\Role;
 
 class UsersTableSeeder extends Seeder
@@ -14,7 +17,6 @@ class UsersTableSeeder extends Seeder
      */
     public function run()
     {
-        $faker = Faker\Factory::create();
         $profile = new Profile();
         $adminRole = Role::whereName('Admin')->first();
         $userRole = Role::whereName('User')->first();
@@ -24,15 +26,15 @@ public function run()
         $user = User::where('email', '=', $seededAdminEmail)->first();
         if ($user === null) {
             $user = User::create([
-                'name'                           => $faker->userName,
-                'first_name'                     => $faker->firstName,
-                'last_name'                      => $faker->lastName,
+                'name'                           => 'Admin',
+                'first_name'                     => 'Harry',
+                'last_name'                      => 'Potter',
                 'email'                          => $seededAdminEmail,
                 'password'                       => Hash::make('password'),
                 'token'                          => str_random(64),
                 'activated'                      => true,
-                'signup_confirmation_ip_address' => $faker->ipv4,
-                'admin_ip_address'               => $faker->ipv4,
+                'signup_confirmation_ip_address' => '127.0.0.1',
+                'admin_ip_address'               => '127.0.0.1',
             ]);
 
             $user->profile()->save($profile);
@@ -44,15 +46,15 @@ public function run()
         $user = User::where('email', '=', 'user@user.com')->first();
         if ($user === null) {
             $user = User::create([
-                'name'                           => $faker->userName,
-                'first_name'                     => $faker->firstName,
-                'last_name'                      => $faker->lastName,
+                'name'                           => 'User',
+                'first_name'                     => 'Hermione',
+                'last_name'                      => 'Granger',
                 'email'                          => 'user@user.com',
                 'password'                       => Hash::make('password'),
                 'token'                          => str_random(64),
                 'activated'                      => true,
-                'signup_ip_address'              => $faker->ipv4,
-                'signup_confirmation_ip_address' => $faker->ipv4,
+                'signup_ip_address'              => '127.0.0.1',
+                'signup_confirmation_ip_address' => '127.0.0.1',
             ]);
 
             $user->profile()->save(new Profile());
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 69bc425ac..77838536d 100755
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -33,7 +33,7 @@
                             <a href="{{ route('register') }}" class="ml-4 text-sm text-gray-500 underline">Register</a>
                         @endif
                     @endif
-                    <a href="{{ url('/terms') }}" class="text-sm text-gray-500 underline" style="margin-left: 5px;">Terms</a>
+                    <a href="{{ url('/terms') }}" class="text-sm text-gray-500 underline ml-4">Terms</a>
                 </div>
             @endif