diff --git a/resources/views/admin/pireps/fields.blade.php b/resources/views/admin/pireps/fields.blade.php
index e8cbba88..dd1b67ca 100644
--- a/resources/views/admin/pireps/fields.blade.php
+++ b/resources/views/admin/pireps/fields.blade.php
@@ -15,54 +15,56 @@
             </h6>
             <div class="form-container-body">
 
-                <div class="form-group col-sm-6">
-                    {{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }}
-                    @if($pirep->read_only)
-                        <p>{{ $pirep->ident }}
-                            {{ Form::hidden('flight_number') }}
-                            {{ Form::hidden('flight_code') }}
-                            {{ Form::hidden('flight_leg') }}
-                        </p>
-                    @else
-                        <div class="row">
-                            <div class="col-sm-4">
-                                {{ Form::text('flight_number', null, [
-                                        'placeholder' => 'Flight Number',
-                                        'class' => 'form-control']) }}
-                                <p class="text-danger">{{ $errors->first('flight_number') }}</p>
+                <div class="row">
+                    <div class="form-group col-sm-6">
+                        {{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }}
+                        @if($pirep->read_only)
+                            <p>{{ $pirep->ident }}
+                                {{ Form::hidden('flight_number') }}
+                                {{ Form::hidden('flight_code') }}
+                                {{ Form::hidden('flight_leg') }}
+                            </p>
+                        @else
+                            <div class="row">
+                                <div class="col-sm-4">
+                                    {{ Form::text('flight_number', null, [
+                                            'placeholder' => 'Flight Number',
+                                            'class' => 'form-control']) }}
+                                    <p class="text-danger">{{ $errors->first('flight_number') }}</p>
+                                </div>
+                                <div class="col-sm-4">
+                                    {{ Form::text('route_code', null, [
+                                            'placeholder' => 'Code (optional)',
+                                            'class' => 'form-control']) }}
+                                    <p class="text-danger">{{ $errors->first('route_code') }}</p>
+                                </div>
+                                <div class="col-sm-4">
+                                    {{ Form::text('route_leg', null, [
+                                            'placeholder' => 'Leg (optional)',
+                                            'class' => 'form-control']) }}
+                                    <p class="text-danger">{{ $errors->first('route_leg') }}</p>
+                                </div>
                             </div>
-                            <div class="col-sm-4">
-                                {{ Form::text('route_code', null, [
-                                        'placeholder' => 'Code (optional)',
-                                        'class' => 'form-control']) }}
-                                <p class="text-danger">{{ $errors->first('route_code') }}</p>
-                            </div>
-                            <div class="col-sm-4">
-                                {{ Form::text('route_leg', null, [
-                                        'placeholder' => 'Leg (optional)',
-                                        'class' => 'form-control']) }}
-                                <p class="text-danger">{{ $errors->first('route_leg') }}</p>
-                            </div>
-                        </div>
-                    @endif
-                </div>
-                <div class="form-group col-sm-3">
-                    {{ Form::label('flight_type', 'Flight Type') }}
-                    {{ Form::select('flight_type',
-                        \App\Models\Enums\FlightType::select(),
-                        null, [
-                            'class' => 'form-control select2',
-                            'readonly' => $pirep->read_only
-                        ])
-                    }}
-                    <p class="text-danger">{{ $errors->first('flight_type') }}</p>
-                </div>
-                <div class="form-group col-sm-3">
-                    <p class="description">Filed Via:</p>
-                    {{ PirepSource::label($pirep->source) }}
-                    @if(filled($pirep->source_name))
-                        ({{ $pirep->source_name }})
-                    @endif
+                        @endif
+                    </div>
+                    <div class="form-group col-sm-3">
+                        {{ Form::label('flight_type', 'Flight Type') }}
+                        {{ Form::select('flight_type',
+                            \App\Models\Enums\FlightType::select(),
+                            null, [
+                                'class' => 'form-control select2',
+                                'readonly' => $pirep->read_only
+                            ])
+                        }}
+                        <p class="text-danger">{{ $errors->first('flight_type') }}</p>
+                    </div>
+                    <div class="form-group col-sm-3">
+                        <p class="description">Filed Via:</p>
+                        {{ PirepSource::label($pirep->source) }}
+                        @if(filled($pirep->source_name))
+                            ({{ $pirep->source_name }})
+                        @endif
+                    </div>
                 </div>
             </div>
         </div>
@@ -75,110 +77,117 @@
                 &nbsp;Flight Information
             </h6>
             <div class="form-container-body">
-                <div class="form-group col-sm-3">
-                    {{ Form::label('airline_id', 'Airline') }}
-                    @if($pirep->read_only)
-                        <p>{{ $pirep->airline->name }}</p>
-                        {{ Form::hidden('airline_id') }}
-                    @else
-                        {{ Form::select('airline_id', $airlines_list, null, [
-                                'class' => 'form-control select2',
-                                'readonly' => $pirep->read_only]) }}
-                        <p class="text-danger">{{ $errors->first('airline_id') }}</p>
-                    @endif
-                </div>
-                <div class="form-group col-sm-3">
-                    {{ Form::label('aircraft_id', 'Aircraft:') }}
-                    @if($pirep->read_only)
-                        <p>{{ $pirep->aircraft->name }}</p>
-                        {{ Form::hidden('aircraft_id') }}
-                    @else
-                        {{ Form::select('aircraft_id', $aircraft_list, null, [
-                                'id' => 'aircraft_select',
-                                'class' => 'form-control select2',
-                                'readonly' => $pirep->read_only
-                            ]) }}
-                        <p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
-                    @endif
-                </div>
-                <div class="form-group col-sm-3">
-                    {{ Form::label('dpt_airport_id', 'Departure Airport:') }}
-                    @if($pirep->read_only)
-                        <p>{{ $pirep->dpt_airport->id }} - {{ $pirep->dpt_airport->name }}</p>
-                        {{ Form::hidden('dpt_airport_id') }}
-                    @else
-                        {{ Form::select('dpt_airport_id', $airports_list, null, [
-                                'class' => 'form-control select2',
-                                'readonly' => $pirep->read_only]) }}
-                        <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
-                    @endif
-                </div>
 
-                <div class="form-group col-sm-3">
-                    {{ Form::label('arr_airport_id', 'Arrival Airport:') }}
-                    @if($pirep->read_only)
-                        <p>{{ $pirep->arr_airport->id }} - {{ $pirep->arr_airport->name }}</p>
-                        {{ Form::hidden('arr_airport_id') }}
-                    @else
-                        {{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }}
-                        <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
-                    @endif
+                <div class="row">
+                    <div class="form-group col-sm-3">
+                        {{ Form::label('airline_id', 'Airline') }}
+                        @if($pirep->read_only)
+                            <p>{{ $pirep->airline->name }}</p>
+                            {{ Form::hidden('airline_id') }}
+                        @else
+                            {{ Form::select('airline_id', $airlines_list, null, [
+                                    'class' => 'form-control select2',
+                                    'readonly' => $pirep->read_only]) }}
+                            <p class="text-danger">{{ $errors->first('airline_id') }}</p>
+                        @endif
+                    </div>
+                    <div class="form-group col-sm-3">
+                        {{ Form::label('aircraft_id', 'Aircraft:') }}
+                        @if($pirep->read_only)
+                            <p>{{ $pirep->aircraft->name }}</p>
+                            {{ Form::hidden('aircraft_id') }}
+                        @else
+                            {{ Form::select('aircraft_id', $aircraft_list, null, [
+                                    'id' => 'aircraft_select',
+                                    'class' => 'form-control select2',
+                                    'readonly' => $pirep->read_only
+                                ]) }}
+                            <p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
+                        @endif
+                    </div>
+                    <div class="form-group col-sm-3">
+                        {{ Form::label('dpt_airport_id', 'Departure Airport:') }}
+                        @if($pirep->read_only)
+                            <p>{{ $pirep->dpt_airport->id }} - {{ $pirep->dpt_airport->name }}</p>
+                            {{ Form::hidden('dpt_airport_id') }}
+                        @else
+                            {{ Form::select('dpt_airport_id', $airports_list, null, [
+                                    'class' => 'form-control select2',
+                                    'readonly' => $pirep->read_only]) }}
+                            <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
+                        @endif
+                    </div>
+
+                    <div class="form-group col-sm-3">
+                        {{ Form::label('arr_airport_id', 'Arrival Airport:') }}
+                        @if($pirep->read_only)
+                            <p>{{ $pirep->arr_airport->id }} - {{ $pirep->arr_airport->name }}</p>
+                            {{ Form::hidden('arr_airport_id') }}
+                        @else
+                            {{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }}
+                            <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
+                        @endif
+                    </div>
                 </div>
 
 
-                <!-- Flight Time Field -->
-                <div class="form-group col-sm-6">
-                    {{ Form::label('flight_time', 'Flight Time (hours & minutes):') }}
-                    @if($pirep->read_only)
-                        <p>
-                            {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes
-                            {{ Form::hidden('hours') }}
-                            {{ Form::hidden('minutes') }}
-                        </p>
-                    @else
+                <div class="row">
+                    <!-- Flight Time Field -->
+                    <div class="form-group col-sm-6">
+                        {{ Form::label('flight_time', 'Flight Time (hours & minutes):') }}
+                        @if($pirep->read_only)
+                            <p>
+                                {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes
+                                {{ Form::hidden('hours') }}
+                                {{ Form::hidden('minutes') }}
+                            </p>
+                        @else
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    {{ Form::number('hours', null, [
+                                            'class' => 'form-control',
+                                            'placeholder' => 'hours',
+                                            'readonly' => $pirep->read_only]) }}
+                                </div>
+                                <div class="col-sm-6">
+                                    {{ Form::number('minutes', null, [
+                                            'class' => 'form-control',
+                                            'placeholder' => 'minutes',
+                                            'readonly' => $pirep->read_only]) }}
+                                </div>
+                                <p class="text-danger">{{ $errors->first('hours') }}</p>
+                                <p class="text-danger">{{ $errors->first('minutes') }}</p>
+                            </div>
+                        @endif
+                    </div>
+
+                    <!-- Level Field -->
+                    <div class="form-group col-sm-6">
+                        {{ Form::label('level', 'Flight Level:') }}
                         <div class="row">
-                            <div class="col-sm-6">
-                                {{ Form::number('hours', null, [
-                                        'class' => 'form-control',
-                                        'placeholder' => 'hours',
-                                        'readonly' => $pirep->read_only]) }}
+                            <div class="col-sm-12">
+                                {{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }}
+                                <p class="text-danger">{{ $errors->first('level') }}</p>
                             </div>
-                            <div class="col-sm-6">
-                                {{ Form::number('minutes', null, [
-                                        'class' => 'form-control',
-                                        'placeholder' => 'minutes',
-                                        'readonly' => $pirep->read_only]) }}
-                            </div>
-                            <p class="text-danger">{{ $errors->first('hours') }}</p>
-                            <p class="text-danger">{{ $errors->first('minutes') }}</p>
-                        </div>
-                    @endif
-                </div>
-
-                <!-- Level Field -->
-                <div class="form-group col-sm-6">
-                    {{ Form::label('level', 'Flight Level:') }}
-                    <div class="row">
-                        <div class="col-sm-12">
-                            {{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }}
-                            <p class="text-danger">{{ $errors->first('level') }}</p>
                         </div>
                     </div>
                 </div>
 
 
-                <!-- Route Field -->
-                <div class="form-group col-sm-6">
-                    {{ Form::label('route', 'Route:') }}
-                    {{ Form::textarea('route', null, ['class' => 'form-control']) }}
-                    <p class="text-danger">{{ $errors->first('route') }}</p>
-                </div>
+                <div class="row">
+                    <!-- Route Field -->
+                    <div class="form-group col-sm-6">
+                        {{ Form::label('route', 'Route:') }}
+                        {{ Form::textarea('route', null, ['class' => 'form-control']) }}
+                        <p class="text-danger">{{ $errors->first('route') }}</p>
+                    </div>
 
-                <!-- Notes Field -->
-                <div class="form-group col-sm-6">
-                    {{ Form::label('notes', 'Notes:') }}
-                    {{ Form::textarea('notes', null, ['class' => 'form-control']) }}
-                    <p class="text-danger">{{ $errors->first('notes') }}</p>
+                    <!-- Notes Field -->
+                    <div class="form-group col-sm-6">
+                        {{ Form::label('notes', 'Notes:') }}
+                        {{ Form::textarea('notes', null, ['class' => 'form-control']) }}
+                        <p class="text-danger">{{ $errors->first('notes') }}</p>
+                    </div>
                 </div>
 
             </div>