diff --git a/app/components/flagging_dashboard.py b/app/components/flagging_dashboard.py
new file mode 100644
index 0000000..2141a70
--- /dev/null
+++ b/app/components/flagging_dashboard.py
@@ -0,0 +1,25 @@
+from dash import Dash, html, dcc, callback, Output, Input, State, dash_table
+import dash_bootstrap_components as dbc
+
+import data_flagging_utils
+
+flagging_dashboard = dbc.Row([ 
+    html.H3("Create flags"),
+
+    #dbc.Row([
+            dcc.Dropdown(
+            id='flag-options',
+            options= data_flagging_utils.filter_flags_by_label(data_flagging_utils.flags_dict,'I'), # displays only flags to invalidate
+           ),
+           #],
+            #width=12
+    #),
+        #],justify="center", align="center"),
+
+    dbc.Row([
+        dbc.Col([dbc.Button('Create Flag', id='flag-button', color="primary", className="mt-2")],width=2),
+        dbc.Col([dbc.Button('Reset Flag', id='reset-flag-button', color="secondary", className="mt-2")],width=2),
+        dbc.Col([dbc.Button('Commit Flag', id='commit-flag-button', color="secondary", className="mt-2")],width=2)
+    ], justify="center", align="center",style={'background-color': '#f8f9fa', 'padding': '20px', 'text-align': 'center'})], 
+    justify="center", align="center",style={'background-color': '#f8f9fa', 'padding': '20px', 'text-align': 'center'}
+    )
\ No newline at end of file
diff --git a/app/components/instrument_dashboard.py b/app/components/instrument_dashboard.py
new file mode 100644
index 0000000..599631a
--- /dev/null
+++ b/app/components/instrument_dashboard.py
@@ -0,0 +1,36 @@
+
+from dash import Dash, html, dcc, callback, Output, Input, State, dash_table
+import dash_bootstrap_components as dbc
+
+instrument_dashboard = dbc.Row([
+    html.H3("Select data table"),
+        
+    # First Dropdown (Instrument Folders)
+    dcc.Dropdown(
+        id="instrument-dropdown",
+        options=[{"label": i, "value": i} for i in []],
+        placeholder="Select an Instrument Folder",
+    ),
+
+    # Spinner wrapping the second and third dropdowns
+    dcc.Loading(
+        type="circle",  # Spinner style
+        children=[
+            # Second Dropdown (Files)
+            dcc.Dropdown(
+                id="file-dropdown",
+                placeholder="Select a File",
+                disabled=True  # Initially disabled
+            ),
+            
+            # Third Dropdown (Sub-selection)
+            dcc.Dropdown(
+                id="sub-dropdown",
+                placeholder="Select Variables",
+                multi = True,
+                disabled=True
+            )
+        ]
+    )
+    ], 
+    justify="center", align="center",style={'background-color': '#f8f9fa', 'padding': '20px', 'text-align': 'center'})
\ No newline at end of file
diff --git a/app/components/upload_component.py b/app/components/upload_component.py
new file mode 100644
index 0000000..0b6d938
--- /dev/null
+++ b/app/components/upload_component.py
@@ -0,0 +1,23 @@
+
+from dash import Dash, html, dcc, callback, Output, Input, State, dash_table
+import dash_bootstrap_components as dbc
+
+upload_component = dbc.Row([
+    html.H3("Open HDF5 file"),
+
+    
+    dcc.Upload(
+    id='upload-image',
+    children=html.Div(['Drag and Drop or ',html.A('Select Files')]),
+        style={
+            'width': '100%',
+            'height': '60px',
+            'lineHeight': '60px',
+            'borderWidth': '1px',
+            'borderStyle': 'dashed',
+            'borderRadius': '5px',
+            'textAlign': 'center',
+            'margin': '10px'
+        }),
+    ], 
+    justify="center", align="center",style={'background-color': '#f8f9fa', 'padding': '20px', 'text-align': 'center'})
\ No newline at end of file
diff --git a/app/data_flagging_app.py b/app/data_flagging_app.py
index 5e8d640..7e7f2b9 100644
--- a/app/data_flagging_app.py
+++ b/app/data_flagging_app.py
@@ -49,6 +49,11 @@ import threading
 import webbrowser
 from time import sleep
 
+
+from components.instrument_dashboard import instrument_dashboard
+from components.flagging_dashboard import flagging_dashboard
+from components.upload_component import upload_component
+
 EnableVisCheckbox = dbc.Col(dbc.Row([dbc.Col(dcc.Checklist(
                                             id='enable-flag-checkbox',
                                             options=[{'label': html.Span('Enable Flag Visualization', style={'font-size': 15, 'padding-left': 10}), 'value': True}],
@@ -125,69 +130,9 @@ app.layout = dbc.Container([
                 html.H6('All measurements are assumed valid unless checked otherwise.')
                 ]
             )],style={'textAlign': 'center'}),
-    dbc.Row([ 
-
-        dbc.Col([
-                dcc.Upload(
-                id='upload-image',
-                children=html.Div(['Drag and Drop or ',html.A('Select Files')]),
-                style={
-                    'fontSize': "16px",
-                    'width': '100%',
-                    'height': '60px',
-                    'lineHeight': '60px',
-                    'borderWidth': '1px',
-                    'borderStyle': 'dashed',
-                    'borderRadius': '5px',
-                    'textAlign': 'center',
-                    'margin': '10px'
-                }),
-                dcc.Dropdown(
-                id='flag-options',
-                options= data_flagging_utils.filter_flags_by_label(data_flagging_utils.flags_dict,'I'), # displays only flags to invalidate
-                )],
-                width=12
-        ),
-        #],justify="center", align="center"),
-
-    #dbc.Row([
-        dbc.Col([dbc.Button('Create Flag', id='flag-button', color="primary", className="mt-2")],width=2),
-        dbc.Col([dbc.Button('Reset Flag', id='reset-flag-button', color="secondary", className="mt-2")],width=2),
-        dbc.Col([dbc.Button('Commit Flag', id='commit-flag-button', color="secondary", className="mt-2")],width=2)
-    ], justify="center", align="center",style={'background-color': '#f8f9fa', 'padding': '20px', 'text-align': 'center'}),
-
-    dbc.Row([
-        html.H3("Instrument Dashboard"),
-        
-        # First Dropdown (Instrument Folders)
-        dcc.Dropdown(
-            id="instrument-dropdown",
-            options=[{"label": i, "value": i} for i in []],
-            placeholder="Select an Instrument Folder",
-        ),
-        
-        # Spinner wrapping the second and third dropdowns
-        dcc.Loading(
-            type="circle",  # Spinner style
-            children=[
-                # Second Dropdown (Files)
-                dcc.Dropdown(
-                    id="file-dropdown",
-                    placeholder="Select a File",
-                    disabled=True  # Initially disabled
-                ),
-                
-                # Third Dropdown (Sub-selection)
-                dcc.Dropdown(
-                    id="sub-dropdown",
-                    placeholder="Select Variables",
-                    multi = True,
-                    disabled=True
-                )
-            ]
-        )
-    ], 
-    justify="center", align="center",style={'background-color': '#f8f9fa', 'padding': '20px', 'text-align': 'center'}),
+    upload_component,
+    instrument_dashboard,
+    flagging_dashboard,
     
     dbc.Row([
         dbc.Col([