diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index ab849c25aa..557bf69e84 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -55,4 +55,4 @@ html[lang='de'] #keywordsAddonLabel, .task {width: 73px;}
 #executionLabel {display: inline; position: relative; width: 50%; left: 37%;}
 #projectLabel {display: inline;}
 #openedBuildLabel {display: inline; position: relative; width: 50%; left: 14%;}
-#bugTypeInputGroup > .chosen-container-multi {width: 25% !important;}
+#bugTypeInputGroup > .table-col {width: 40% !important;}
diff --git a/module/bug/css/view.css b/module/bug/css/view.css
index 452146b88a..7583e152e0 100644
--- a/module/bug/css/view.css
+++ b/module/bug/css/view.css
@@ -5,3 +5,4 @@
 .tab-pane table {border: 1px solid #ddd; border-top: none;}
 .btn-edit-comment {z-index: 100;}
 .select-project-modal .modal-body {right: 15px;}
+.osContent, .browserContent {margin: 0 0 5px;}
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index b1894260ef..c99a3a42f6 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -91,12 +91,20 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
               <div class='input-group' id='bugTypeInputGroup'>
                 <?php echo html::select('type', $lang->bug->typeList, $type, "class='form-control'");?>
                 <?php if($showOS):?>
-                <span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
-                <?php echo html::select('os[]', $lang->bug->osList, $os, "class='form-control chosen' multiple");?>
+                <div class='table-col'>
+                  <div class='input-group'>
+                    <span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
+                    <?php echo html::select('os[]', $lang->bug->osList, $os, "class='form-control chosen' multiple");?>
+                  </div>
+                </div>
                 <?php endif;?>
                 <?php if($showBrowser):?>
-                <span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
-                <?php echo html::select('browser[]', $lang->bug->browserList, $browser, "class='form-control chosen' multiple");?>
+                <div class='table-col'>
+                  <div class='input-group'>
+                    <span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
+                    <?php echo html::select('browser[]', $lang->bug->browserList, $browser, "class='form-control chosen' multiple");?>
+                  </div>
+                </div>
                 <?php endif;?>
               </div>
             </td>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 7bc23ffad9..2b78e900a7 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -233,31 +233,27 @@
                 <tr>
                   <th><?php echo $lang->bug->os;?></th>
                   <td>
-                  <?php
-                  $os     = '';
-                  $osList = explode(',', $bug->os);
-                  foreach($osList as $value)
-                  {
-                      if(empty($value)) continue;
-                      $os .= $lang->bug->osList[$value] . ',';
-                  }
-                  echo trim($os, ',');
-                  ?>
+                  <?php $osList = explode(',', $bug->os);?>
+                  <?php if($osList):?>
+                  <p class='osContent'>
+                    <?php foreach($osList as $os):?>
+                    <?php if($os) echo "<span class='label label-outline'>" .  zget($lang->bug->osList, $os) . "</span>";?>
+                    <?php endforeach;?>
+                  </p>
+                  <?php endif;?>
                   </td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->browser;?></th>
                   <td>
-                  <?php
-                  $browser     = '';
-                  $browserList = explode(',', $bug->browser);
-                  foreach($browserList as $value)
-                  {
-                      if(empty($value)) continue;
-                      $browser .= $lang->bug->browserList[$value] . ',';
-                  }
-                  echo trim($browser, ',');
-                  ?>
+                  <?php $browserList = explode(',', $bug->browser);?>
+                  <?php if($browserList):?>
+                  <p class='browserContent'>
+                    <?php foreach($browserList as $browser):?>
+                    <?php if($os) echo "<span class='label label-outline'>" .  zget($lang->bug->browserList, $browser) . "</span>";?>
+                    <?php endforeach;?>
+                  </p>
+                  <?php endif;?>
                   </td>
                 </tr>
                 <tr>