diff --git a/module/file/model.php b/module/file/model.php
index b3cdace637..1d46dd47e8 100644
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -263,7 +263,8 @@ class fileModel extends model
         if(empty($data)) return '';
         $data = str_replace('\"', '"', $data);
 
-        ini_set('pcre.backtrack_limit', strlen($data));
+        $dataLength = strlen($data);
+        if(ini_get('pcre.backtrack_limit') < $dataLength) ini_set('pcre.backtrack_limit', $dataLength);
         preg_match_all('/<img src="(data:image\/(\S+);base64,(\S+))".*\/>/U', $data, $out);
         foreach($out[3] as $key => $base64Image)
         {
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 19dc79f1c0..e22ac9f001 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -262,7 +262,7 @@ class testcase extends control
 
             $this->loadModel('action');
             $this->action->create('case', $caseID, 'Opened');
-            $response['locate'] = $this->createLink('testcase', 'browse', "productID={$_POST['product']}&branch={$_POST['branch']}&browseType=byModule&args={$_POST['module']}");
+            $response['locate'] = $this->createLink('testcase', 'browse', "productID={$_POST['product']}&branch=" . (isset($_POST['branch']) ? $_POST['branch'] : '') . "&browseType=byModule&args={$_POST['module']}");
             $this->send($response);
         }
         if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
diff --git a/module/testcase/view/createbug.html.php b/module/testcase/view/createbug.html.php
index d9d7e8ace6..8f61b4f7ce 100644
--- a/module/testcase/view/createbug.html.php
+++ b/module/testcase/view/createbug.html.php
@@ -12,12 +12,12 @@
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
 <form action='<?php echo $this->createLink('bug', 'create', "product=$productID&branch=$branch&extras=$extras")?>' target='_parent' method='post'>
-  <table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
+  <table class='table table-condensed table-hover table-striped tablesorter' style='word-break:break-all'>
     <thead>
       <tr>
         <th class='w-60px'><?php echo $lang->testcase->stepID;?></th>
-        <th class='w-p40'><?php echo $lang->testcase->stepDesc;?></th>
-        <th class='w-p20'><?php echo $lang->testcase->stepExpect;?></th>
+        <th class='w-p30'><?php echo $lang->testcase->stepDesc;?></th>
+        <th class='w-p30'><?php echo $lang->testcase->stepExpect;?></th>
         <th><?php echo $lang->testcase->result;?></th>
         <th class='w-p20'><?php echo $lang->testcase->real;?></th>
       </tr>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 4ee7eafd72..cbbc7b1725 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -74,7 +74,7 @@
 
 <div class='row-table'>
   <div class='col-main'>
-    <div class='main'>
+    <div class='main' style='word-break:break-all'>
       <fieldset>
         <legend><?php echo $lang->testcase->precondition;?></legend>
         <?php echo nl2br($case->precondition);?>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 9fc599fdd1..084c2f2e1c 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -20,13 +20,13 @@
     </div>
   </div>
 
-  <div class='main pdb-20'>
+  <div class='main pdb-20' style='word-break:break-all'>
     <fieldset>
       <legend><?php echo $lang->testcase->precondition;?></legend>
       <?php echo $case->precondition;?>
     </fieldset>
     <div id='casesResults'>
-      <table class='table table-condensed table-hover' style='border: 1px solid #ddd'>
+      <table class='table table-condensed table-hover' style='border: 1px solid #ddd; word-break:break-all'>
         <?php $count = count($results);?>
         <caption class='text-left' style='border: 1px solid #ddd; border-bottom: none;'>
           <strong><?php echo $lang->testcase->result?> &nbsp;<span> <?php printf($lang->testtask->showResult, $count)?></span> <span class='result-tip'></span></strong>
@@ -51,8 +51,8 @@
               <thead>
                 <tr>
                   <th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
-                  <th class='w-p40'><?php echo $lang->testcase->stepDesc;?></th>
-                  <th class='w-p20'><?php echo $lang->testcase->stepExpect;?></th>
+                  <th class='w-p30'><?php echo $lang->testcase->stepDesc;?></th>
+                  <th class='w-p30'><?php echo $lang->testcase->stepExpect;?></th>
                   <th><?php echo $lang->testcase->result;?></th>
                   <th class='w-p20'><?php echo $lang->testcase->real;?></th>
                 </tr>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 6f3b590028..d0cbe959f8 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -20,15 +20,15 @@
 </div>
 <div class='main'>
   <form class='form-condensed' method='post'>
-    <table class='table table-bordered table-form'>
+    <table class='table table-bordered table-form' style='word-break:break-all'>
       <thead>
         <tr>
-          <td colspan='5'><strong><?php echo $lang->testcase->precondition;?></strong> <?php echo $run->case->precondition;?></td>
+          <td colspan='5' style='word-break: break-all;'><strong><?php echo $lang->testcase->precondition;?></strong> <?php echo $run->case->precondition;?></td>
         </tr>
         <tr>
           <th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
-          <th class='w-p40'><?php  echo $lang->testcase->stepDesc;?></th>
-          <th class='w-p20'><?php  echo $lang->testcase->stepExpect;?></th>
+          <th class='w-p30'><?php  echo $lang->testcase->stepDesc;?></th>
+          <th class='w-p30'><?php  echo $lang->testcase->stepExpect;?></th>
           <th class='w-100px'><?php echo $lang->testcase->result;?></th>
           <th><?php echo $lang->testcase->real;?></th>
         </tr>