diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index 6698de246a..695fa86b06 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -32,7 +32,7 @@ Form::macro('countries', function ($name = 'country', $selected = null, $class =
 
     $idclause = (!is_null($id)) ? $id : '';
 
-    $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:350px"'.$idclause.' aria-label="'.$name.'" data-placeholder="'.trans('localizations.select_country').'">';
+    $select = '<select name="'.$name.'" class="'.$class.'" style="width:100%" '.$idclause.' aria-label="'.$name.'" data-placeholder="'.trans('localizations.select_country').'">';
     $select .= '<option value=""  role="option">'.trans('localizations.select_country').'</option>';
 
     // Pull the autoglossonym array from the localizations translation file
diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php
index c8bf734033..c68ecaa8c2 100644
--- a/resources/views/partials/forms/edit/address.blade.php
+++ b/resources/views/partials/forms/edit/address.blade.php
@@ -33,7 +33,7 @@
 
 <div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
     {{ Form::label('country', trans('general.country'), array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-5">
+    <div class="col-md-7">
     {!! Form::countries('country', old('country', $item->country), 'select2') !!}
         {!! $errors->first('country', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
diff --git a/resources/views/partials/forms/edit/user-select.blade.php b/resources/views/partials/forms/edit/user-select.blade.php
index 6283f37467..d9cba4b75f 100644
--- a/resources/views/partials/forms/edit/user-select.blade.php
+++ b/resources/views/partials/forms/edit/user-select.blade.php
@@ -2,7 +2,7 @@
 
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
-    <div class="col-md-6{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
+    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="users" data-placeholder="{{ trans('general.select_user') }}" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select" aria-label="{{ $fieldname }}">
             @if ($user_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $user_id }}" selected="selected" role="option" aria-selected="true"  role="option">
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 60a882ea62..8d24e440b8 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -449,7 +449,7 @@
                           <!-- Country -->
                           <div class="form-group{{ $errors->has('country') ? ' has-error' : '' }}">
                               <label class="col-md-3 control-label" for="country">{{ trans('general.country') }}</label>
-                              <div class="col-md-9">
+                              <div class="col-md-6">
                                   {!! Form::countries('country', old('country', $user->country), 'col-md-12 select2') !!}
                                   {!! $errors->first('country', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                               </div>