diff --git a/mod/data/field/checkbox/field.class.php b/mod/data/field/checkbox/field.class.php
index 8b7c0a65330..5b3cbf725ed 100644
--- a/mod/data/field/checkbox/field.class.php
+++ b/mod/data/field/checkbox/field.class.php
@@ -46,10 +46,9 @@ class data_field_checkbox extends data_field_base {
         if ($this->field->required) {
             $str .= '$nbsp;' . get_string('requiredelement', 'form');
             $str .= '</span></legend>';
-            $str .= '<div>';
-            $str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
+            $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
-            $str .= '</div>';
+            $str .= html_writer::div($image, 'inline-req');
         } else {
             $str .= '</span></legend>';
         }
@@ -62,7 +61,7 @@ class data_field_checkbox extends data_field_base {
             }
             $str .= '<input type="hidden" name="field_' . $this->field->id . '[]" value="" />';
             $str .= '<input type="checkbox" id="field_'.$this->field->id.'_'.$i.'" name="field_' . $this->field->id . '[]" ';
-            $str .= 'value="' . s($checkbox) . '" ';
+            $str .= 'value="' . s($checkbox) . '" class="mod-data-input" ';
 
             if (array_search($checkbox, $content) !== false) {
                 $str .= 'checked />';
diff --git a/mod/data/field/date/field.class.php b/mod/data/field/date/field.class.php
index fc5f4a94e45..04a6e52af34 100644
--- a/mod/data/field/date/field.class.php
+++ b/mod/data/field/date/field.class.php
@@ -51,7 +51,7 @@ class data_field_date extends data_field_base {
             $content = time();
         }
 
-        $str = '<div title="'.s($this->field->description).'">';
+        $str = '<div title="'.s($this->field->description).'" class="mod-data-input">';
         $dayselector = html_writer::select_time('days', 'field_'.$this->field->id.'_day', $content);
         $monthselector = html_writer::select_time('months', 'field_'.$this->field->id.'_month', $content);
         $yearselector = html_writer::select_time('years', 'field_'.$this->field->id.'_year', $content);
diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php
index b1cee2445ba..22c275d366d 100644
--- a/mod/data/field/file/field.class.php
+++ b/mod/data/field/file/field.class.php
@@ -73,7 +73,7 @@ class data_field_file extends data_field_base {
             $html .= '&nbsp;' . get_string('requiredelement', 'form') . '</span></legend>';
             $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
-            $html .= html_writer::div($image);
+            $html .= html_writer::div($image, 'inline-req');
         } else {
             $html .= '</span></legend>';
         }
@@ -93,7 +93,9 @@ class data_field_file extends data_field_base {
         // Print out file manager.
 
         $output = $PAGE->get_renderer('core', 'files');
+        $html .= '<div class="mod-data-input">';
         $html .= $output->render($fm);
+        $html .= '</div>';
         $html .= '</fieldset>';
         $html .= '</div>';
 
diff --git a/mod/data/field/latlong/field.class.php b/mod/data/field/latlong/field.class.php
index d89df71bdef..0bb0221c4c7 100644
--- a/mod/data/field/latlong/field.class.php
+++ b/mod/data/field/latlong/field.class.php
@@ -62,14 +62,15 @@ class data_field_latlong extends data_field_base {
         $str = '<div title="'.s($this->field->description).'">';
         $str .= '<fieldset><legend><span class="accesshide">'.$this->field->name.'</span></legend>';
         $str .= '<table><tr><td align="right">';
-        $str .= '<label for="field_'.$this->field->id.'_0">' . get_string('latitude', 'data');
+        $str .= '<label for="field_'.$this->field->id.'_0" class="mod-data-input">' . get_string('latitude', 'data');
         if ($this->field->required) {
             $str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
         }
         $str .= '</label></td><td><input type="text" name="field_'.$this->field->id.'_0" id="field_'.$this->field->id.'_0" value="';
         $str .= s($lat).'" size="10" />°N</td></tr>';
-        $str .= '<tr><td align="right"><label for="field_'.$this->field->id.'_1">' . get_string('longitude', 'data');
+        $str .= '<tr><td align="right"><label for="field_'.$this->field->id.'_1" class="mod-data-input">';
+        $str .= get_string('longitude', 'data');
         if ($this->field->required) {
             $str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
diff --git a/mod/data/field/menu/field.class.php b/mod/data/field/menu/field.class.php
index c53e3cb320d..941576e1fc9 100644
--- a/mod/data/field/menu/field.class.php
+++ b/mod/data/field/menu/field.class.php
@@ -54,10 +54,11 @@ class data_field_menu extends data_field_base {
         if ($this->field->required) {
             $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
-            $str .= html_writer::div($image);
+            $str .= html_writer::div($image, 'inline-req');
         }
         $str .= '</label>';
-        $str .= html_writer::select($options, 'field_'.$this->field->id, $content, array(''=>get_string('menuchoose', 'data')), array('id'=>'field_'.$this->field->id));
+        $str .= html_writer::select($options, 'field_'.$this->field->id, $content, array('' => get_string('menuchoose', 'data')),
+                                    array('id' => 'field_'.$this->field->id, 'class' => 'mod-data-input'));
 
         $str .= '</div>';
 
diff --git a/mod/data/field/multimenu/field.class.php b/mod/data/field/multimenu/field.class.php
index 75b6bc094d4..986b0d273aa 100644
--- a/mod/data/field/multimenu/field.class.php
+++ b/mod/data/field/multimenu/field.class.php
@@ -49,13 +49,14 @@ class data_field_multimenu extends data_field_base {
         $str .= '<label for="field_' . $this->field->id . '">';
         $str .= html_writer::span($this->field->name, 'accesshide');
         if ($this->field->required) {
-            $str .= '<div>';
+            $str .= '<div class="inline-req">';
             $str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
             $str .= '</div>';
         }
         $str .= '</label>';
-        $str .= '<select name="field_' . $this->field->id . '[]" id="field_' . $this->field->id . '" multiple="multiple">';
+        $str .= '<select name="field_' . $this->field->id . '[]" id="field_' . $this->field->id . '"';
+        $str .= ' multiple="multiple" class="mod-data-input">';
 
         foreach (explode("\n", $this->field->param1) as $option) {
             $option = trim($option);
diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php
index d4ade199637..8db472092f5 100644
--- a/mod/data/field/picture/field.class.php
+++ b/mod/data/field/picture/field.class.php
@@ -78,7 +78,7 @@ class data_field_picture extends data_field_base {
             $str .= '&nbsp;' . get_string('requiredelement', 'form') . '</span></legend>';
             $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                       array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
-            $str .= html_writer::div($image);
+            $str .= html_writer::div($image, 'inline-req');
         } else {
             $str .= '</span></legend>';
         }
@@ -105,6 +105,7 @@ class data_field_picture extends data_field_base {
         // Print out file manager.
 
         $output = $PAGE->get_renderer('core', 'files');
+        $str .= '<div class="mod-data-input">';
         $str .= $output->render($fm);
 
         $str .= '<div class="mdl-left">';
@@ -112,6 +113,7 @@ class data_field_picture extends data_field_base {
         $str .= '<label for="field_'.$this->field->id.'_alttext">'.get_string('alttext','data') .'</label>&nbsp;<input type="text" name="field_'
                 .$this->field->id.'_alttext" id="field_'.$this->field->id.'_alttext" value="'.s($alttext).'" />';
         $str .= '</div>';
+        $str .= '</div>';
 
         $str .= '</fieldset>';
         $str .= '</div>';
diff --git a/mod/data/field/radiobutton/field.class.php b/mod/data/field/radiobutton/field.class.php
index 3008fb0f48b..6e5b10de7fc 100644
--- a/mod/data/field/radiobutton/field.class.php
+++ b/mod/data/field/radiobutton/field.class.php
@@ -49,7 +49,7 @@ class data_field_radiobutton extends data_field_base {
             $str .= '&nbsp;' . get_string('requiredelement', 'form') . '</span></legend>';
             $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                       array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
-            $str .= html_writer::div($image);
+            $str .= html_writer::div($image, 'inline-req');
         } else {
             $str .= '</span></legend>';
         }
@@ -63,7 +63,7 @@ class data_field_radiobutton extends data_field_base {
                 continue; // skip empty lines
             }
             $str .= '<input type="radio" id="field_'.$this->field->id.'_'.$i.'" name="field_' . $this->field->id . '" ';
-            $str .= 'value="' . s($radio) . '" ';
+            $str .= 'value="' . s($radio) . '" class="mod-data-input" ';
 
             if ($content == $radio) {
                 // Selected by user.
diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index dda933ee3a9..36973a41ae1 100644
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -58,8 +58,9 @@ class data_field_textarea extends data_field_base {
         $str .= '<label for="field_' . $this->field->id . '">';
         $str .= html_writer::span($this->field->name, "accesshide");
         if ($this->field->required) {
-            $str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
+            $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
+            $str .= html_writer::div($image, 'inline-req');
         }
         $str .= '</label>';
 
@@ -145,6 +146,7 @@ class data_field_textarea extends data_field_base {
         }
         $editor->use_editor($field, $options, $fpoptions);
         $str .= '<input type="hidden" name="'.$field.'_itemid" value="'.$draftitemid.'" />';
+        $str .= '<div class="mod-data-input">';
         $str .= '<div><textarea id="'.$field.'" name="'.$field.'" rows="'.$this->field->param3.'" cols="'.$this->field->param2.'" spellcheck="true">'.s($text).'</textarea></div>';
         $str .= '<div><label class="accesshide" for="' . $field . '_content1">' . get_string('format') . '</label>';
         $str .= '<select id="' . $field . '_content1" name="'.$field.'_content1">';
@@ -154,6 +156,7 @@ class data_field_textarea extends data_field_base {
         }
         $str .= '</select>';
 
+        $str .= '</div>';
         $str .= '</div>';
         $str .= '</div>';
         return $str;
diff --git a/mod/data/field/url/field.class.php b/mod/data/field/url/field.class.php
index b89ecce3efb..4d22f32a693 100644
--- a/mod/data/field/url/field.class.php
+++ b/mod/data/field/url/field.class.php
@@ -56,27 +56,42 @@ class data_field_url extends data_field_base {
                 $text = $content->content1;
             }
         }
+
+        $autolinkable = !empty($this->field->param1) and empty($this->field->param2);
+
         $str = '<div title="' . s($this->field->description) . '">';
 
         $label = '<label for="' . $fieldid . '"><span class="accesshide">' . $this->field->name . '</span>';
         if ($this->field->required) {
-            $label .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
+            $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                       array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
+            if ($autolinkable) {
+                $label .= html_writer::div(get_string('requiredelement', 'form'), 'accesshide');
+            } else {
+                $label .= html_writer::div($image, 'inline-req');
+            }
         }
         $label .= '</label>';
 
-        if (!empty($this->field->param1) and empty($this->field->param2)) {
+        if ($autolinkable) {
             $str .= '<table><tr><td align="right">';
-            $str .= get_string('url','data').':</td><td>';
+            $str .= '<span class="mod-data-input">' . get_string('url', 'data') . ':</span>';
+            if (!empty($image)) {
+                $str .= $image;
+            }
+            $str .= '</td><td>';
             $str .= $label;
             $str .= '<input type="text" name="field_'.$this->field->id.'_0" id="'.$fieldid.'" value="'.$url.'" size="60" />';
             $str .= '<button id="filepicker-button-'.$options->client_id.'" style="display:none">'.$straddlink.'</button></td></tr>';
-            $str .= '<tr><td align="right">'.get_string('text','data').':</td><td><input type="text" name="field_'.$this->field->id.'_1" id="field_'.$this->field->id.'_1" value="'.s($text).'" size="60" /></td></tr>';
+            $str .= '<tr><td align="right"><span class="mod-data-input">'.get_string('text', 'data').':</span></td><td>';
+            $str .= '<input type="text" name="field_'.$this->field->id.'_1" id="field_'.$this->field->id.'_1" value="'.s($text).'"';
+            $str .= ' size="60" /></td></tr>';
             $str .= '</table>';
         } else {
             // Just the URL field
             $str .= $label;
-            $str .= '<input type="text" name="field_'.$this->field->id.'_0" id="'.$fieldid.'" value="'.s($url).'" size="60" />';
+            $str .= '<input type="text" name="field_'.$this->field->id.'_0" id="'.$fieldid.'" value="'.s($url).'"';
+            $str .= ' size="60" class="mod-data-input" />';
             if (count($options->repositories) > 0) {
                 $str .= '<button id="filepicker-button-'.$options->client_id.'" class="visibleifjs">'.$straddlink.'</button>';
             }
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 2a43b9af7ab..e7b6ccd380f 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -290,11 +290,12 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
         $str = '<div title="' . s($this->field->description) . '">';
         $str .= '<label for="field_'.$this->field->id.'"><span class="accesshide">'.$this->field->name.'</span>';
         if ($this->field->required) {
-            $str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
+            $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
+            $str .= html_writer::div($image, 'inline-req');
         }
-        $str .= '</label><input class="basefieldinput" type="text" name="field_'.$this->field->id.'" id="field_'.$this->field->id;
-        $str .= '" value="'.s($content).'" />';
+        $str .= '</label><input class="basefieldinput mod-data-input" type="text" name="field_'.$this->field->id.'"';
+        $str .= ' id="field_' . $this->field->id . '" value="'.s($content).'" />';
         $str .= '</div>';
 
         return $str;
diff --git a/mod/data/styles.css b/mod/data/styles.css
index 61b088302ba..58b88fca09f 100644
--- a/mod/data/styles.css
+++ b/mod/data/styles.css
@@ -78,3 +78,20 @@
 #page-mod-data-edit .req {
     cursor: help;
 }
+#page-mod-data-edit .inline-req .req {
+    position: absolute;
+}
+#page-mod-data-edit .inline-req {
+    text-align: left;
+}
+#page-mod-data-edit .mod-data-input {
+    margin-left: 10px;
+}
+
+.dir-rtl#page-mod-data-edit .inline-req {
+    text-align: right;
+}
+.dir-rtl#page-mod-data-edit .mod-data-input {
+    margin-left: 0px;
+    margin-right: 10px;
+}