diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 1586adaa5c..fa82b877e1 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -73,13 +73,11 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='actions'><?php if(!$bug->deleted) echo $actionLinks;?></div>
-      <fieldset id='commentBox' class='hidden'>
+      <fieldset id='commentBox' class='hide'>
         <legend><?php echo $lang->comment;?></legend>
         <form method='post' action='<?php echo inlink('edit', "bugID=$bug->id&comment=true")?>'>
-          <table align='center' class='table-1'>
-          <tr><td><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></td></tr>
-          <tr><td><?php echo html::submitButton() . html::backButton();?></td></tr>
-          </table>
+          <div class="form-group"><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></div>
+          <?php echo html::submitButton() . html::backButton();?>
         </form>
       </fieldset>
     </div>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index a9a7c109e8..0b65fd788e 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -81,7 +81,7 @@
       </fieldset>
       <fieldset>
         <legend><?php echo $lang->testcase->stepDesc;?></legend>
-        <table class='table table-condensed table-hover table-striped table-borderless'>
+        <table class='table table-condensed table-hover table-striped'>
           <thead>
             <tr>
               <th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
@@ -104,13 +104,11 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='actions'><?php echo $actionLinks;?></div>
-      <fieldset id='commentBox' class='hidden'>
+      <fieldset id='commentBox' class='hide'>
         <legend><?php echo $lang->comment;?></legend>
         <form method='post' action='<?php echo inlink('edit', "caseID=$case->id&comment=true")?>'>
-          <table align='center' class='table-1'>
-          <tr><td><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></td></tr>
-          <tr><td><?php echo html::submitButton() . html::backButton();?></td></tr>
-          </table>
+          <div class="form-group"><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></div>
+          <?php echo html::submitButton() . html::backButton();?>
         </form>
       </fieldset>
     </div>