diff --git a/resources/views/layouts/default/flights/table.blade.php b/resources/views/layouts/default/flights/table.blade.php
index 881701ab..57c41c24 100644
--- a/resources/views/layouts/default/flights/table.blade.php
+++ b/resources/views/layouts/default/flights/table.blade.php
@@ -17,29 +17,31 @@
                      "x-saved-class" is the class to add/remove if the bid exists or not
                      If you change it, remember to change it in the in-array line as well
                 --}}
+                @if (!setting('pilots.only_flights_from_current') || $flight->dpt_airport->icao == Auth::user()->current_airport->icao)
                 <button class="btn btn-round btn-icon btn-icon-mini
                            {{ in_array($flight->id, $saved, true) ? 'btn-info':'' }}
                            save_flight"
                         x-id="{{ $flight->id }}"
                         x-saved-class="btn-info"
                         type="button"
-                        title="Add/Remove Bid"
+                        title="@lang('frontend.flights.addremovebid')"
                 >
                     <i class="fas fa-map-marker"></i>
                 </button>
+                @endif
             </div>
         </div>
         <div class="row">
             <div class="col-sm-5">
                 {{--<table class="table-condensed"></table>--}}
-                <span class="title">DEP&nbsp;</span>
+                <span class="title">{{ strtoupper(trans('frontend.flights.dep')) }}&nbsp;</span>
                 {{ $flight->dpt_airport->name }}
                 (<a href="{{route('frontend.airports.show', [
                             'id' => $flight->dpt_airport->icao
                             ])}}">{{$flight->dpt_airport->icao}}</a>)
                 @if($flight->dpt_time), {{ $flight->dpt_time }}@endif
                 <br />
-                <span class="title">ARR&nbsp;</span>
+                <span class="title">{{ strtoupper(trans('frontend.flights.arr')) }}&nbsp;</span>
                 {{ $flight->arr_airport->name }}
                 (<a href="{{route('frontend.airports.show', [
                             'id' => $flight->arr_airport->icao
@@ -47,19 +49,19 @@
                 @if($flight->arr_time), {{ $flight->arr_time }}@endif
                 <br />
                 @if($flight->distance)
-                    <span class="title">DISTANCE&nbsp;</span>
+                    <span class="title">{{ strtoupper(trans('frontend.global.distance')) }}&nbsp;</span>
                     {{ $flight->distance }} {{ setting('units.distance') }}
                 @endif
                 <br />
                 @if($flight->level)
-                    <span class="title">LEVEL&nbsp;</span>
+                    <span class="title">{{ strtoupper(trans('frontend.flights.level')) }}&nbsp;</span>
                     {{ $flight->level }} {{ setting('units.altitude') }}
                 @endif
             </div>
             <div class="col-sm-7">
                 <div class="row">
                     <div class="col-sm-12">
-                        <span class="title">ROUTE&nbsp;</span>
+                        <span class="title">{{ strtoupper(trans('frontend.global.route')) }}&nbsp;</span>
                         {{ $flight->route }}
                     </div>
                 </div>