diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index 21b0aa0102..38fe6a6546 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -49,11 +49,7 @@
             @endif
 
                 @if (isset($helpText))
-                    <div class="box-tools pull-right">
-                        <button class="slideout-menu-toggle btn btn-box-tool btn-box-tool-lg" data-toggle="tooltip" title="Help"><i class="fa fa-question" aria-hidden="true"></i>
-                        <span class="sr-only">Help</span>
                  @include('partials.forms.edit.submit-button')
-                </div>
                 @endif
             </div><!-- /.box-header -->
 
diff --git a/resources/views/partials/forms/edit/company-select.blade.php b/resources/views/partials/forms/edit/company-select.blade.php
index 551ba3a64f..b6508e6c7f 100644
--- a/resources/views/partials/forms/edit/company-select.blade.php
+++ b/resources/views/partials/forms/edit/company-select.blade.php
@@ -3,17 +3,17 @@
     <!-- full company support is enabled and this user isn't a superadmin -->
     <div class="form-group">
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7">
-        <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select" aria-label="{{ $fieldname }}">
-            @if ($company_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $company_id }}" selected="selected" role="option" aria-selected="true"  role="option">
-                    {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
-                </option>
-            @else
-                <option value="" role="option">{{ trans('general.select_company') }}</option>
-            @endif
+        <div class="col-md-7">
+            <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select" aria-label="{{ $fieldname }}">
+                @if ($company_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
+                    <option value="{{ $company_id }}" selected="selected" role="option" aria-selected="true"  role="option">
+                        {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
+                    </option>
+                @else
+                    <option value="" role="option">{{ trans('general.select_company') }}</option>
+                @endif
+            </select>
         </div>
-
     </div>
 
 @else
@@ -34,5 +34,6 @@
         {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times"></i> :message</span></div>') !!}
 
     {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span></div>') !!}
+    </div>
 
 @endif
diff --git a/resources/views/partials/more-info.blade.php b/resources/views/partials/more-info.blade.php
index eca7f427f6..8eb039da3f 100644
--- a/resources/views/partials/more-info.blade.php
+++ b/resources/views/partials/more-info.blade.php
@@ -1 +1 @@
-<a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='fa fa-life-ring'></i> {{ trans('help.more_info_title') }}"  data-placement="{{ (isset($helpPosition)) ? $helpPosition : 'right'  }}" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Info Missing'  }}"><i class="fa fa-life-ring"></i></a>
+<a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus"  data-placement="{{ (isset($helpPosition)) ? $helpPosition : 'right'  }}" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Info Missing'  }}"><i class="fa fa-life-ring"></i></a>