diff --git a/application/views/cabrillo/index.php b/application/views/cabrillo/index.php
index c462d6d8..2b74cd06 100644
--- a/application/views/cabrillo/index.php
+++ b/application/views/cabrillo/index.php
@@ -26,12 +26,12 @@
 			<form class="form" action="<?php echo site_url('cabrillo/export'); ?>" method="post" enctype="multipart/form-data">
 				<div class="mb-3 d-flex align-items-center row">
 					<div class="col-md-3 control-label" for="station_id"><?php echo lang('export_cabrillo_select_station'); ?> </div>
-					<select id="station_id" name="station_id" class="form-select my-1 me-sm-2 col-md-4">
+					<select id="station_id" name="station_id" class="form-select my-1 me-sm-2 col-md-4 w-auto">
 					<?php foreach ($station_profile->result() as $station) { ?>
 						<option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_callsign') ?>: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 					<?php } ?>
 					</select>
-					<button id="button1id" type="button" onclick="loadYears();" name="button1id" class="btn btn-sm btn-primary"> <?php echo lang('export_cabrillo_proceed') ?></button>
+					<button id="button1id" type="button" onclick="loadYears();" name="button1id" class="btn btn-sm btn-primary w-auto"> <?php echo lang('export_cabrillo_proceed') ?></button>
 				</div>
 
 				<div class="mb-3 d-flex align-items-center row contestyear">
@@ -42,11 +42,11 @@
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="soapbox">Club: </div>
-					<input class="form-control my-1 me-sm-2 col-md-4" id="soapbox" type="soapbox" name="soapbox" aria-label="soapbox">
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="soapbox" type="soapbox" name="soapbox" aria-label="soapbox">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryoperator"><?php echo lang('export_cabrillo_cat_operator') ?>: </div>
-					<select class="form-select my-1 me-sm-2 col-md-4" id="categoryoperator" name="categoryoperator">
+					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryoperator" name="categoryoperator">
 						<option value="SINGLE-OP"><?php echo lang('export_cabrillo_cat_operator_single_op') ?></option>
 						<option value="MULTI-OP"><?php echo lang('export_cabrillo_cat_operator_multi_op') ?></option>
 						<option value="CHECKLOG"><?php echo lang('export_cabrillo_cat_operator_checklog') ?></option>
@@ -54,14 +54,14 @@
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryassisted"><?php echo lang('export_cabrillo_cat_assisted') ?>: </div>
-					<select class="form-select my-1 me-sm-2 col-md-4" id="categoryassisted" name="categoryassisted">
+					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryassisted" name="categoryassisted">
 						<option value="NON-ASSISTED"><?php echo lang('export_cabrillo_cat_assisted_not_ass') ?></option>
 						<option value="ASSISTED"><?php echo lang('export_cabrillo_cat_assisted_ass') ?></option>
 					</select>
 				</div>
 					<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryband"><?php echo lang('export_cabrillo_cat_band') ?>: </div>
-					<select class="form-select my-1 me-sm-2 col-md-4" id="categoryband" name="categoryband">
+					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryband" name="categoryband">
 						<option value="ALL"><?php echo lang('general_word_all') ?></option>
 						<option value="160M">160 M</option>
 						<option value="80M">80 M</option>
@@ -92,7 +92,7 @@
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categorymode"><?php echo lang('export_cabrillo_cat_mode') ?>: </div>
-					<select class="form-select my-1 me-sm-2 col-md-4" id="categorymode" name="categorymode">
+					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categorymode" name="categorymode">
 						<option value="MIXED">MIXED</option>
 						<option value="CW">CW</option>
 						<option value="DIGI">DIGI</option>
@@ -103,7 +103,7 @@
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categorypower"><?php echo lang('export_cabrillo_cat_power') ?>: </div>
-					<select class="form-select my-1 me-sm-2 col-md-4" id="categorypower" name="categorypower">
+					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categorypower" name="categorypower">
 						<option value="LOW">LOW</option>
 						<option value="HIGH">HIGH</option>
 						<option value="QRP">QRP</option>
@@ -111,7 +111,7 @@
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categorystation"><?php echo lang('export_cabrillo_cat_station') ?>: </div>
-					<select class="form-select my-1 me-sm-2 col-md-4" id="categorystation" name="categorystation">
+					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categorystation" name="categorystation">
 						<option value="FIXED">FIXED</option>
 						<option value="DISTRIBUTED">DISTRIBUTED</option>
 						<option value="MOBILE">MOBILE</option>
@@ -127,7 +127,7 @@
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categorytransmitter"><?php echo lang('export_cabrillo_cat_transmitter') ?>: </div>
-					<select class="form-select my-1 me-sm-2 col-md-4" id="categorytransmitter" name="categorytransmitter">
+					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categorytransmitter" name="categorytransmitter">
 						<option value="ONE">ONE</option>
 						<option value="TWO">TWO</option>
 						<option value="LIMITED">LIMITED</option>
@@ -137,7 +137,7 @@
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryoverlay"><?php echo lang('export_cabrillo_cat_overlay') ?>: </div>
-					<select class="form-select my-1 me-sm-2 col-md-4" id="categoryoverlay" name="categoryoverlay">
+					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryoverlay" name="categoryoverlay">
 						<option value="CLASSIC">CLASSIC</option>
 						<option value="ROOKIE">ROOKIE</option>
 						<option value="TB-WIRES">TB-WIRES</option>
@@ -148,36 +148,36 @@
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="operators"><?php echo lang('export_cabrillo_operators') ?>: </div>
-					<input class="form-control my-1 me-sm-2 col-md-4" id="operators" type="operators" name="operators" aria-label="operators">
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="operators" type="operators" name="operators" aria-label="operators">
 					</select>
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="soapbox"><?php echo lang('export_cabrillo_soapbox') ?>: </div>
-					<input class="form-control my-1 me-sm-2 col-md-4" id="soapbox" type="text" name="soapbox" aria-label="soapbox">
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="soapbox" type="text" name="soapbox" aria-label="soapbox">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="address"><?php echo lang('export_cabrillo_address') ?>: </div>
-					<input class="form-control my-1 me-sm-2 col-md-4" id="address" type="text" name="address" aria-label="address">
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="address" type="text" name="address" aria-label="address">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="addresscity"><?php echo lang('export_cabrillo_address_city') ?>: </div>
-					<input class="form-control my-1 me-sm-2 col-md-4" id="addresscity" type="text" name="addresscity" aria-label="addresscity">
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="addresscity" type="text" name="addresscity" aria-label="addresscity">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="addressstateprovince"><?php echo lang('export_cabrillo_address_state_province') ?>: </div>
-					<input class="form-control my-1 me-sm-2 col-md-4" id="addressstateprovince" type="text" name="addressstateprovince" aria-label="addressstateprovince">
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="addressstateprovince" type="text" name="addressstateprovince" aria-label="addressstateprovince">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="addresspostalcode"><?php echo lang('export_cabrillo_address_postalcode') ?>: </div>
-					<input class="form-control my-1 me-sm-2 col-md-4" id="addresspostalcode" type="text" name="addresspostalcode" aria-label="addresspostalcode">
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="addresspostalcode" type="text" name="addresspostalcode" aria-label="addresspostalcode">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="addresscountry"><?php echo lang('export_cabrillo_address_country') ?>: </div>
-					<input class="form-control my-1 me-sm-2 col-md-4" id="addresscountry" type="text" name="addresscountry" aria-label="addresscountry">
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="addresscountry" type="text" name="addresscountry" aria-label="addresscountry">
 				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="button1id"></div>
-					<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"> <?php echo lang('general_word_export') ?></button>
+					<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary w-auto"> <?php echo lang('general_word_export') ?></button>
 				</div>
 			</form>
 
diff --git a/assets/js/sections/cabrillo.js b/assets/js/sections/cabrillo.js
index 868a5ed3..97685dc3 100644
--- a/assets/js/sections/cabrillo.js
+++ b/assets/js/sections/cabrillo.js
@@ -10,9 +10,9 @@ function loadYears() {
         success: function (data) {
             if (data.length > 0) {
                 $(".contestyear").append('<div class="col-md-3 control-label" for="year">' + lang_export_cabrillo_select_year + '</div>' +
-                '<select id="year" class="custom-select my-1 mr-sm-2 col-md-2" name="year">' +
+                '<select id="year" class="form-select my-1 me-sm-2 col-md-2 w-auto" name="year">' +
                 '</select>' +
-                '  <button onclick="loadContests();" class="btn btn-sm btn-primary" type="button">' + lang_export_cabrillo_proceed + '</button>'); 
+                '  <button onclick="loadContests();" class="btn btn-sm btn-primary w-auto" type="button">' + lang_export_cabrillo_proceed + '</button>'); 
 
                 $.each(data, function(key, value) {
                     $('#year')
@@ -38,9 +38,9 @@ function loadContests() {
         },
         success: function (data) {
                 $(".contestname").append('<div class="col-md-3 control-label" for="contestid">' + lang_export_cabrillo_select_contest + '</div>' +
-                '<select class="custom-select my-1 mr-sm-2 col-md-4" id="contestid" name="contestid">' +
+                '<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="contestid" name="contestid">' +
                 '</select>' +
-                '  <button onclick="loadContestDates();" class="btn btn-sm btn-primary" type="button">' + lang_export_cabrillo_proceed + '</button>'); 
+                '  <button onclick="loadContestDates();" class="btn btn-sm btn-primary w-auto" type="button">' + lang_export_cabrillo_proceed + '</button>'); 
 
                 $.each(data, function(key, value) {
                     $('#contestid')
@@ -62,11 +62,11 @@ function loadContestDates() {
                 'station_id': $("#station_id").val()},
         success: function (data) {
                 $(".contestdates").append('<div class="col-md-3 control-label" for="contestdates">' + lang_export_cabrillo_select_date_range + '</div>' +
-                '<select class="custom-select my-1 mr-sm-2 col-md-2" id="contestdatesfrom" name="contestdatesfrom">' +
+                '<select class="form-select my-1 me-sm-2 col-md-2 w-auto" id="contestdatesfrom" name="contestdatesfrom">' +
                 '</select>' +
-                '<select class="custom-select my-1 mr-sm-2 col-md-2" id="contestdatesto" name="contestdatesto">' +
+                '<select class="form-select my-1 me-sm-2 col-md-2 w-auto" id="contestdatesto" name="contestdatesto">' +
                 '</select>' +
-                '  <button class="btn btn-sm btn-primary" onclick="addAdditionalInfo();" type="button">' + lang_export_cabrillo_proceed + '</button>'); 
+                '  <button class="btn btn-sm btn-primary w-auto" onclick="addAdditionalInfo();" type="button">' + lang_export_cabrillo_proceed + '</button>'); 
 
                 $.each(data, function(key, value) {
                     $('#contestdatesfrom')