diff --git a/firebird-ng/src/app/geometry.service.ts b/firebird-ng/src/app/geometry.service.ts
index ea705c3..97308d5 100644
--- a/firebird-ng/src/app/geometry.service.ts
+++ b/firebird-ng/src/app/geometry.service.ts
@@ -24,7 +24,7 @@ export const ALL_GROUPS = [
 ]
 
 // constants.ts
-export const DEFAULT_GEOMETRY = 'epic-central-optimized';
+export const DEFAULT_GEOMETRY = 'builtin://epic-central-optimized';
 
 @Injectable({
   providedIn: 'root'
diff --git a/firebird-ng/src/app/input-config/input-config.component.html b/firebird-ng/src/app/input-config/input-config.component.html
index c3ad568..b833562 100644
--- a/firebird-ng/src/app/input-config/input-config.component.html
+++ b/firebird-ng/src/app/input-config/input-config.component.html
@@ -20,32 +20,18 @@ <h5>Geometry</h5>
         </div>
       </div>
 
-
-
-      <h5>Trajectories Source</h5>
       <div class="form-group">
-        <select class="form-control" [formControl]="selectedEventSource">
-          <option value="no-events">No events (may upload later)</option>
-          <option value="https://firebird-eic.org/dirc_event.json.zip">DIRC optical (load DIRC only geometry)</option>
-          <option value="https://firebird-eic.org/py8_dis-cc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-cc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-cc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-cc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-cc_all_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-cc_all_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-nc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-nc_10x100_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_10x100_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-nc_10x100_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_10x100_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-nc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-nc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-nc_18x275_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_18x275_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-nc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-          <option value="https://firebird-eic.org/py8_dis-nc_all_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip">py8_dis-nc_all_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip</option>
-        </select>
+        <div class="mt-4">
+          <h5>Trajectories Event Source</h5>
+          <div class="mt-4">
+            <firebird-resource-select #trajectorySelect [options]="trajectoryOptions" label="Trajectories event source file" class="full-width-field"></firebird-resource-select>
+          </div>
+        </div>
       </div>
 
       <div class="form-group">
         <div class="mt-4">
-          <h5>EDM4EIC events</h5>
+          <h5>Edm4Eic Event Source</h5>
           Select file with EDM4EIC data
           <div class="mt-4">
             <firebird-resource-select #edm4eicSelect [options]="edm4eicOptions" label="EDM4EIC file" class="full-width-field"></firebird-resource-select>
@@ -136,6 +122,8 @@ <h6 class="mb-0">API Port:</h6>
       <button type="button" class="btn btn-lg btn-primary" [routerLink]="['/display']">DISPLAY</button>
     </div>
 
+    <br><br>
+
     <mat-accordion class="mt-4">
       <mat-expansion-panel>
         <mat-expansion-panel-header>
diff --git a/firebird-ng/src/app/input-config/input-config.component.ts b/firebird-ng/src/app/input-config/input-config.component.ts
index 993171f..0b7d174 100644
--- a/firebird-ng/src/app/input-config/input-config.component.ts
+++ b/firebird-ng/src/app/input-config/input-config.component.ts
@@ -43,6 +43,9 @@ export class InputConfigComponent implements OnInit, AfterViewInit {
   @ViewChild('edm4eicSelect')
   edm4eicSelect!: ResourceSelectComponent;
 
+  @ViewChild('trajectorySelect')
+  trajectorySelect!: ResourceSelectComponent;
+
 
   public geometryOptions: string[] = [
     "builtin://epic-central-optimized",
@@ -78,6 +81,25 @@ export class InputConfigComponent implements OnInit, AfterViewInit {
     "https://eic.github.io/epic/artifacts/tgeo/epic_zdc_sipm_on_tile_only.root"
 ];
 
+  public trajectoryOptions: string[] = [
+      "https://firebird-eic.org/dirc_event.json.zip",
+      "https://firebird-eic.org/py8_dis-cc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-cc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-cc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-cc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-cc_all_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-nc_10x100_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-nc_10x100_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-nc_10x100_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-nc_18x275_minq2-1000_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-nc_18x275_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-nc_18x275_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-nc_5x41_minq2-100_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+      "https://firebird-eic.org/py8_dis-nc_all_minq2-1_minp-300mev_vtxcut-5m_nevt-5.evt.zip",
+    ]
+
+
+
   public edm4eicOptions: string[] = [
     "",
 
@@ -109,6 +131,7 @@ export class InputConfigComponent implements OnInit, AfterViewInit {
     // Now the 'geometrySelect' is available
     this.bindConfigToControl(this.geometrySelect.value, this.configService.selectedGeometry);
     this.bindConfigToControl(this.edm4eicSelect.value, this.configService.edm4eicEventSource);
+    this.bindConfigToControl(this.trajectorySelect.value, this.configService.trajectoryEventSource);
   }
 
   ngOnInit(): void {
@@ -116,7 +139,7 @@ export class InputConfigComponent implements OnInit, AfterViewInit {
     //this.bindConfigToControl(this.geometryUrl, this.configService.selectedGeometry);
 
 
-    this.bindConfigToControl(this.selectedEventSource, this.configService.trajectoryEventSource);
+    //this.bindConfigToControl(this.selectedEventSource, this.configService.trajectoryEventSource);
     this.bindConfigToControl(this.onlyCentralDetector, this.configService.onlyCentralDetector);
     this.bindConfigToControl(this.serverUseApi, this.configService.localServerUseApi);
     this.bindConfigToControl(this.serverApiHost, this.configService.localServerHost);
diff --git a/pyrobird/src/pyrobird/__about__.py b/pyrobird/src/pyrobird/__about__.py
index 9212ded..2d16a56 100644
--- a/pyrobird/src/pyrobird/__about__.py
+++ b/pyrobird/src/pyrobird/__about__.py
@@ -2,4 +2,4 @@
 # This file is part of Firebird Event Display and is licensed under the LGPLv3.
 # See the LICENSE file in the project root for full license information.
 
-__version__ = "0.1.5"
+__version__ = "0.1.7"