diff --git a/module/story/css/create.css b/module/story/css/create.css
index 1a2fa994f9..1e646d9c98 100644
--- a/module/story/css/create.css
+++ b/module/story/css/create.css
@@ -10,3 +10,9 @@
 #dataform .priBox, #dataform .estimateBox {width: 120px;}
 #dataform .categoryBox {width: 150px;}
 #dataform .needNotReviewBox {width: 130px;}
+.input-group-addon.assignedTo {min-width: 77px;}
+.input-group .source {display: flex; width: 50%;}
+.input-group .sourceNote {display: flex; width: 50%;}
+.source .input-group-addon, .sourceNote .input-group-addon {padding-top: 9px;}
+#sourceNoteBox {width: 80px;}
+#moduleIdBox .input-group-addon {min-width: 77px;}
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index cf519dbeda..9b485e3d92 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -90,12 +90,16 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
             </td>
             <td colspan="2" class="sourceTd <?php echo $hiddenSource?> sourceBox">
               <div class="input-group">
-                <div class="input-group">
-                  <div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->source;?></div>
-                  <?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
-                  <span class='input-group-addon' id='sourceNoteBox'><?php echo $lang->story->sourceNote;?></span>
-                  <?php $sourceNoteWidth = isonlybody() ? "style='width: 89px;'" : "style='width: 180px;'"?>
-                  <?php echo html::input('sourceNote', $sourceNote, "class='form-control' $sourceNoteWidth");?>
+                <div class="input-group" style='display: flex;'>
+                  <div class='source'>
+                    <div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->source;?></div>
+                    <?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
+                  </div>
+                  <div class='sourceNote'>
+                    <div class='input-group-addon' id='sourceNoteBox'><?php echo $lang->story->sourceNote;?></div>
+                    <?php $sourceNoteWidth = isonlybody() ? "style='width: 89px;'" : ""?>
+                    <?php echo html::input('sourceNote', $sourceNote, "class='form-control' $sourceNoteWidth");?>
+                  </div>
                 </div>
               </div>
             </td>
@@ -126,7 +130,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
             </td>
             <td colspan='<?php echo $type == 'story' ? 2 : 1;?>' id='assignedToBox' class='hidden'>
               <div class='input-group'>
-                <div class="input-group-addon"><?php echo $lang->story->assignedTo;?></div>
+                <div class="input-group-addon assignedTo"><?php echo $lang->story->assignedTo;?></div>
                 <?php echo html::select('assignedTo', $users, '', "class='form-control picker-select'");?>
               </div>
             </td>