diff --git a/README.md b/README.md
new file mode 100644
index 0000000..406f86f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+# TODO
+
+- Type Creat Form localization
+- Remove design phase databaase connection in Schema and Model
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 4a31790..848e231 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -1,13 +1,18 @@
 <?php return [
-  'plugin' => [
-    'name' => 'Fleet',
-    'description' => '',
-  ],
-  'aircraft' => [
-    'manufacturers' => [
-      'name' => 'Name',
-      'link' => 'Link',
-      'history' => 'History',
+    'plugin' => [
+        'name' => 'Fleet',
+        'description' => '',
     ],
-  ],
-];
+    'aircraft' => [
+        'manufacturers' => [
+            'name' => 'Name',
+            'link' => 'Link',
+            'history' => 'History',
+        ],
+    ],
+    'menu' => [
+        'main' => 'GA Fleet',
+        'manufacturers' => 'Aircraft Manufacturers',
+        'types' => 'Aircraft Types',
+    ],
+];
\ No newline at end of file
diff --git a/models/AircraftManufacturer.php b/models/AircraftManufacturer.php
index f9208f6..baa521c 100644
--- a/models/AircraftManufacturer.php
+++ b/models/AircraftManufacturer.php
@@ -18,7 +18,9 @@ class AircraftManufacturer extends Model
   /**
    * @var string The database table used by the model.
    */
-  public $table = 'germanairlinesva_fleet_aircraft_manufacturers';
+  // public $table = 'germanairlinesva_fleet_aircraft_manufacturers';
+  public $table = 'aircraft_manufacturers';
+  protected $connection = 'germanairlinesva_fleet';
 
   /**
    * @var array Validation rules
diff --git a/models/AircraftType.php b/models/AircraftType.php
index 985bdb4..de304aa 100644
--- a/models/AircraftType.php
+++ b/models/AircraftType.php
@@ -18,7 +18,9 @@ class AircraftType extends Model
   /**
    * @var string The database table used by the model.
    */
-  public $table = 'germanairlinesva_fleet_aircraft_types';
+  // public $table = 'germanairlinesva_fleet_aircraft_types';
+  public $table = 'aircraft_types';
+  protected $connection = 'germanairlinesva_fleet';
 
   /**
    * @var array Validation rules
diff --git a/models/aircraftmanufacturer/fields.yaml b/models/aircraftmanufacturer/fields.yaml
index 1742274..690eb48 100644
--- a/models/aircraftmanufacturer/fields.yaml
+++ b/models/aircraftmanufacturer/fields.yaml
@@ -2,13 +2,16 @@ fields:
     name:
         label: 'germanairlinesva.fleet::lang.aircraft.manufacturers.name'
         span: auto
+        required: 1
         type: text
     link:
         label: 'germanairlinesva.fleet::lang.aircraft.manufacturers.link'
         span: auto
+        required: 1
         type: text
     history:
         label: 'germanairlinesva.fleet::lang.aircraft.manufacturers.history'
-        size: ''
+        size: large
         span: auto
-        type: textarea
+        required: 1
+        type: richeditor
diff --git a/models/aircrafttype/columns.yaml b/models/aircrafttype/columns.yaml
index 98038d6..19eeb2b 100644
--- a/models/aircrafttype/columns.yaml
+++ b/models/aircrafttype/columns.yaml
@@ -8,6 +8,9 @@ columns:
     typerating_id:
         label: typerating_id
         type: number
+    only_charter:
+        label: only_charter
+        type: text
     type:
         label: type
         type: text
diff --git a/models/aircrafttype/fields.yaml b/models/aircrafttype/fields.yaml
index 55e241c..9aeccc9 100644
--- a/models/aircrafttype/fields.yaml
+++ b/models/aircrafttype/fields.yaml
@@ -1,7 +1,141 @@
-fields:
-    aircraft_manufacturer:
-        label: Relation
-        nameFrom: name
-        descriptionFrom: description
-        span: auto
-        type: relation
+tabs:
+    fields:
+        aircraft_manufacturer:
+            label: Manufacturer
+            nameFrom: name
+            descriptionFrom: description
+            span: auto
+            required: 1
+            type: relation
+            tab: Operational
+        typerating_id:
+            label: Typerating
+            span: auto
+            required: 1
+            type: number
+            tab: Operational
+        only_charter:
+            label: 'Charter Only'
+            options:
+                'No': 'no'
+                'Yes': 'yes'
+            showSearch: true
+            span: auto
+            required: 1
+            type: dropdown
+            tab: Operational
+        type:
+            label: Type
+            span: auto
+            required: 1
+            type: text
+            tab: Operational
+        simbrief_type:
+            label: 'SimBrief Type'
+            span: auto
+            required: 1
+            type: text
+            tab: Operational
+        dom:
+            label: DOM
+            span: auto
+            required: 1
+            type: number
+            tab: Weights
+        mpld:
+            label: 'Max Payload'
+            span: auto
+            required: 1
+            type: number
+            tab: Weights
+        mzfm:
+            label: 'Max ZFM'
+            span: auto
+            required: 1
+            type: number
+            tab: Weights
+        fuel_capacity:
+            label: 'Fuel Capacity'
+            span: auto
+            required: 1
+            type: number
+            tab: Weights
+        mtom:
+            label: 'Max TOM'
+            span: auto
+            required: 1
+            type: number
+            tab: Weights
+        mlam:
+            label: 'Max LAM'
+            span: auto
+            required: 1
+            type: number
+            tab: Weights
+        description:
+            label: Description
+            size: large
+            span: auto
+            required: 1
+            type: richeditor
+            tab: Informational
+        wingspan:
+            label: Wingspan
+            span: auto
+            required: 1
+            type: text
+            tab: Informational
+        length:
+            label: Length
+            span: auto
+            required: 1
+            type: text
+            tab: Informational
+        cruise_speed:
+            label: 'Cruise Speed'
+            span: auto
+            required: 1
+            type: text
+            tab: Informational
+        range:
+            label: Range
+            span: auto
+            required: 1
+            type: text
+            tab: Informational
+        engines:
+            label: Engines
+            span: auto
+            required: 1
+            type: text
+            tab: Informational
+        max_fl:
+            label: 'Max FL'
+            span: auto
+            required: 1
+            type: number
+            tab: Informational
+        capacity_flight_crew:
+            label: 'Flight Crew'
+            span: auto
+            required: 1
+            type: number
+            tab: Informational
+        capacity_cabin_crew:
+            label: 'Cabin Crew'
+            span: auto
+            required: 1
+            type: number
+            tab: Informational
+        capacity_passengers:
+            label: Passengers
+            span: auto
+            required: 1
+            type: number
+            tab: Informational
+        capacity_cargo:
+            label: Cargo
+            span: auto
+            required: 1
+            type: number
+            tab: Informational
diff --git a/models/aircrafttypes/fields.yaml b/models/aircrafttypes/fields.yaml
deleted file mode 100644
index e972d33..0000000
--- a/models/aircrafttypes/fields.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-fields:
-    manufacturer:
-        label: Relation
-        nameFrom: name
-        descriptionFrom: description
-        span: auto
-        type: relation
diff --git a/plugin.yaml b/plugin.yaml
index cfc39bf..ea40908 100644
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -4,3 +4,17 @@ plugin:
     author: 'German Airlines VA'
     icon: oc-icon-plane
     homepage: ''
+navigation:
+    main-menu-item:
+        label: 'germanairlinesva.fleet::lang.menu.main'
+        url: /
+        icon: icon-plane
+        sideMenu:
+            side-menu-item:
+                label: 'germanairlinesva.fleet::lang.menu.manufacturers'
+                url: /germanairlinesva/fleet/aircraftmanufacturers
+                icon: icon-wrench
+            side-menu-item2:
+                label: 'germanairlinesva.fleet::lang.menu.types'
+                url: germanairlinesva/fleet/aircrafttypes
+                icon: icon-paper-plane
diff --git a/updates/builder_table_create_aircraft_manufacturers.php b/updates/builder_table_create_aircraft_manufacturers.php
index 58ae390..7c0b314 100644
--- a/updates/builder_table_create_aircraft_manufacturers.php
+++ b/updates/builder_table_create_aircraft_manufacturers.php
@@ -8,8 +8,8 @@ class BuilderTableCreateGermanAirlinesVaAircraftManufacturers extends Migration
 {
   public function up()
   {
-    Schema::connection('germanairlinesva_fleet')->create('ga_aircraft_manufacturers', function ($table) {
-      //Schema::create('ga_aircraft_manufacturers', function ($table) {
+    Schema::connection('germanairlinesva_fleet')->create('aircraft_manufacturers', function ($table) {
+      //Schema::create('germanairlinesva_fleet_aircraft_manufacturers', function ($table) {
       $table->engine = 'InnoDB';
       $table->bigIncrements('id')->unsigned();
       $table->string('name');
@@ -20,7 +20,7 @@ class BuilderTableCreateGermanAirlinesVaAircraftManufacturers extends Migration
 
   public function down()
   {
-    Schema::connection('germanairlinesva_fleet')->dropIfExists('ga_aircraft_manufacturers');
-    //Schema::dropIfExists('ga_aircraft_manufacturers');
+    Schema::connection('germanairlinesva_fleet')->dropIfExists('aircraft_manufacturers');
+    //Schema::dropIfExists('germanairlinesva_fleet_aircraft_manufacturers');
   }
 }
diff --git a/updates/builder_table_create_aircraft_types.php b/updates/builder_table_create_aircraft_types.php
index 77fb39a..66be62e 100644
--- a/updates/builder_table_create_aircraft_types.php
+++ b/updates/builder_table_create_aircraft_types.php
@@ -8,12 +8,20 @@ class BuilderTableCreateGermanAirlinesVaAircraftTypes extends Migration
 {
   public function up()
   {
-    Schema::connection('germanairlinesva_fleet')->create('ga_aircraft_types', function ($table) {
-      //Schema::create('ga_aircraft_types', function ($table) {
+    Schema::connection('germanairlinesva_fleet')->create('aircraft_types', function ($table) {
+      //Schema::create('germanairlinesva_fleet_aircraft_types', function ($table) {
       $table->engine = 'InnoDB';
       $table->bigIncrements('id')->unsigned();
       $table->bigInteger('aircraft_manufacturer_id')->unsigned();
+      $table
+        ->foreign('aircraft_manufacturer_id')
+        ->references('id')
+        ->on('aircraft_manufacturers');
       $table->bigInteger('typerating_id')->unsigned();
+      //$table
+      //  ->foreign('typerating_manufacturer_id')
+      //  ->references('id')
+      //  ->on('typeratings');
       $table->enum('only_charter', ['yes', 'no']);
       $table->string('type');
       $table->text('description');
@@ -39,7 +47,7 @@ class BuilderTableCreateGermanAirlinesVaAircraftTypes extends Migration
 
   public function down()
   {
-    Schema::connection('germanairlinesva_fleet')->dropIfExists('ga_aircraft_types');
-    //Schema::dropIfExists('ga_aircraft_types');
+    Schema::connection('germanairlinesva_fleet')->dropIfExists('aircraft_types');
+    //Schema::dropIfExists('germanairlinesva_fleet_aircraft_types');
   }
 }