diff --git a/module/admin/view/bind.html.php b/module/admin/view/bind.html.php
index 4964612a4a..feb1505971 100644
--- a/module/admin/view/bind.html.php
+++ b/module/admin/view/bind.html.php
@@ -16,11 +16,11 @@
 <caption><?php echo $lang->admin->bind->caption;?></caption>
   <tr>
     <th class='rowhead'><?php echo $lang->user->account;?></th>
-	<td><?php echo html::input('account', '', "class='text-3'");?></td>
+	<td><?php echo html::input('account', '', "class='form-control'");?></td>
   </tr>
   <tr>
     <th class="rowhead"><?php echo $lang->user->password;?></th>
-    <td><?php echo html::password('password', '', "class='text-3'");?></td>
+    <td><?php echo html::password('password', '', "class='form-control'");?></td>
   </tr>  
   <tr>
     <th><td colspan="2" class="a-center"><?php echo html::submitButton() . html::hidden('sn', $sn);?></td></th>
diff --git a/module/admin/view/register.html.php b/module/admin/view/register.html.php
index 2d886e9e71..38a407fe03 100644
--- a/module/admin/view/register.html.php
+++ b/module/admin/view/register.html.php
@@ -16,31 +16,31 @@
 <caption><?php echo $lang->admin->register->caption;?></caption>
   <tr>
     <th class='rowhead'><?php echo $lang->user->account;?></th>
-	<td><?php echo html::input('account', '', "class='text-3'") . '<span class="star">*</span>' . $lang->admin->register->lblAccount;?></td>
+	<td><?php echo html::input('account', '', "class='form-control'") . '<span class="star">*</span>' . $lang->admin->register->lblAccount;?></td>
   </tr>
   <tr>
     <th class="rowhead"><?php echo $lang->user->realname;?></th>
-    <td><?php echo html::input('realname', '', "class='text-3'") . '<span class="star">*</span>';?></td>
+    <td><?php echo html::input('realname', '', "class='form-control'") . '<span class="star">*</span>';?></td>
   </tr>
   <tr>
     <th class="rowhead"><?php echo $lang->user->company;?></th>
-    <td><?php echo html::input('company', $register->company, "class='text-3'");?></td>
+    <td><?php echo html::input('company', $register->company, "class='form-control'");?></td>
   </tr>
   <tr>
     <th class="rowhead"><?php echo $lang->user->phone;?></th>
-    <td><?php echo html::input('phone', '', "class='text-3'");?></td>
+    <td><?php echo html::input('phone', '', "class='form-control'");?></td>
   </tr>  
   <tr>
     <th class="rowhead"><?php echo $lang->user->email;?></td>
-    <td><?php echo html::input('email', $register->email, "class='text-3'") . '<span class="star">*</span>';?></td>
+    <td><?php echo html::input('email', $register->email, "class='form-control'") . '<span class="star">*</span>';?></td>
   </tr>  
   <tr>
     <th class="rowhead"><?php echo $lang->user->password;?></th>
-    <td><?php echo html::password('password1', '', "class='text-3'") . '<span class="star">*</span>' . $lang->admin->register->lblPasswd;?></td>
+    <td><?php echo html::password('password1', '', "class='form-control'") . '<span class="star">*</span>' . $lang->admin->register->lblPasswd;?></td>
   </tr>  
   <tr>
     <th class='rowhead'><?php echo $lang->user->password2;?></td>
-    <td><?php echo html::password('password2', '', "class='text-3'") . '<span class="star">*</span>';?></td>
+    <td><?php echo html::password('password2', '', "class='form-control'") . '<span class="star">*</span>';?></td>
   </tr> 
   <tr>
     <th>
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 9fe2a6e3a5..a836c2bc05 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -17,7 +17,7 @@
     <caption><?php echo $bug->title;?></caption>
     <tr>
       <td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
-      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, 'class=select-3');?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control'");?></td>
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->bug->openedBuild;?></td>
diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php
index 92c591fb50..13d87d0078 100644
--- a/module/bug/view/browse.custom.html.php
+++ b/module/bug/view/browse.custom.html.php
@@ -78,7 +78,7 @@
                ?>
               </div>
               <?php endif?>
-              <div class='f-right'><?php $pager->show();?></div>
+              <div class='text-right'><?php $pager->show();?></div>
             </td>
           </tr>
           </tfoot>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 83249a0f29..0f070c6e52 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -36,7 +36,7 @@ js::set('customed', $customed);
     echo "<span id='bysearchTab'><a href='#' class='link-icon'><i class='icon-search icon'></i>&nbsp;{$lang->bug->byQuery}</a></span> ";
     ?>
   </div>
-  <div class='f-right'>
+  <div class='text-right'>
     <?php
 
     echo '<span class="link-button dropButton">';
@@ -197,7 +197,7 @@ if($customed)
                  ?>
                 </div>
                 <?php endif?>
-                <div class='f-right'><?php $pager->show();?></div>
+                <div class='text-right'><?php $pager->show();?></div>
               </td>
             </tr>
           </tfoot>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 1646bffc31..8796bec49f 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -29,7 +29,7 @@ js::set('refresh', $lang->refresh);
     <tr>
       <th class='rowhead'><?php echo $lang->bug->lblProductAndModule;?></th>
       <td>
-        <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value) class='select-3' autocomplete='off'");?>
+        <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value) class='form-control' autocomplete='off'");?>
         <span id='moduleIdBox'>
         <?php
         echo html::select('module', $moduleOptionMenu, $moduleID, "onchange='loadModuleRelated()'");
@@ -56,11 +56,11 @@ js::set('refresh', $lang->refresh);
     </tr>
     <tr>
       <th class='rowhead'><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
-      <td><span id='assignedToBox'><?php echo html::select('assignedTo', $users, $assignedTo, "class='select-3 chosen'");?></span></td>
+      <td><span id='assignedToBox'><?php echo html::select('assignedTo', $users, $assignedTo, "class='form-control chosen'");?></span></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->bug->title;?></th>
-      <td><?php echo html::input('title', $bugTitle, "class='text-1'");?></td>
+      <td><?php echo html::input('title', $bugTitle, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->bug->steps;?></th>
@@ -100,13 +100,13 @@ js::set('refresh', $lang->refresh);
       <td>
         <?php 
         echo html::select('mailto[]', $users, str_replace(' ', '', $mailto), 'class=text-1 multiple');
-        if($contactLists) echo html::select('', $contactLists, '', "class='f-right' onchange=\"setMailto('mailto', this.value)\"");
+        if($contactLists) echo html::select('', $contactLists, '', "class='text-right' onchange=\"setMailto('mailto', this.value)\"");
         ?>
       </td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->bug->keywords;?></th>
-      <td><?php echo html::input('keywords', $keywords, "class='text-1'");?></td>
+      <td><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->bug->files;?></th>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 5c5c855341..f1b325dbf2 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -72,35 +72,35 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
         <table class='table-1 a-left' cellpadding='0' cellspacing='0'>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->product;?></td>
-            <td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='select-3'");?></td>
+            <td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control'");?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->module;?></td>
             <td>
-              <span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='select-3'");?></span>
+              <span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control'");?></span>
             </td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->productplan;?></td>
             <td>
-              <span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, 'class=select-3');?></span>
+              <span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, "class='form-control'");?></span>
             </td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->type;?></td>
-            <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, 'class=select-3');?>
+            <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control'");?>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->severity;?></td>
-            <td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, 'class=select-3');?>
+            <td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, "class='form-control'");?>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->pri;?></td>
-            <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=select-3');?>
+            <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, "class='form-control'");?>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->status;?></td>
-            <td><?php echo html::select('status', $lang->bug->statusList, $bug->status, 'class=select-3');?></td>
+            <td><?php echo html::select('status', $lang->bug->statusList, $bug->status, "class='form-control'");?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->confirmed;?></td>
@@ -108,23 +108,23 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
-            <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-3 chosen'");?></td>
+            <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->os;?></td>
-            <td><?php echo html::select('os', $lang->bug->osList, $bug->os, 'class=select-3');?></td>
+            <td><?php echo html::select('os', $lang->bug->osList, $bug->os, "class='form-control'");?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->browser;?></td>
-            <td><?php echo html::select('browser', $lang->bug->browserList, $bug->browser, 'class=select-3');?></td>
+            <td><?php echo html::select('browser', $lang->bug->browserList, $bug->browser, "class='form-control'");?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->keywords;?></td>
-            <td><?php echo html::input('keywords', $bug->keywords, 'class="text-1"');?></td>
+            <td><?php echo html::input('keywords', $bug->keywords, 'class="form-control"');?></td>
           </tr>
           <tr>
             <td class='rowhead w-p20'><?php echo $lang->bug->mailto;?></td>
-            <td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="text-1" multiple');?></td>
+            <td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control" multiple');?></td>
           </tr>
         </table>
       </fieldset>
@@ -143,7 +143,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->task;?></td>
-            <td><div id='taskIdBox'><?php echo html::select('task', $tasks, $bug->task, 'class=select-3');?></div></td>
+            <td><div id='taskIdBox'><?php echo html::select('task', $tasks, $bug->task, "class='form-control'");?></div></td>
           </tr>
         </table>
       </fieldset>
@@ -161,7 +161,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->resolvedBy;?></td>
-            <td><?php echo html::select('resolvedBy', $users, $bug->resolvedBy, 'class=select-3');?></td>
+            <td><?php echo html::select('resolvedBy', $users, $bug->resolvedBy, "class='form-control'");?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
@@ -169,7 +169,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
-            <td><span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, 'class=select-3');?></span></td>
+            <td><span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control'");?></span></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->resolution;?></td>
@@ -181,7 +181,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->closedBy;?></td>
-            <td><?php echo html::select('closedBy', $users, $bug->closedBy, 'class=select-3');?></td>
+            <td><?php echo html::select('closedBy', $users, $bug->closedBy, "class='form-control'");?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->closedDate;?></td>
@@ -194,11 +194,11 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
         <table class='table-1 a-left'>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->linkBug;?></td>
-            <td><?php echo html::input('linkBug', $bug->linkBug, 'class="text-1"');?></td>
+            <td><?php echo html::input('linkBug', $bug->linkBug, 'class="form-control"');?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->case;?></td>
-            <td><?php echo html::input('case', $bug->case, 'class="text-1"');?></td>
+            <td><?php echo html::input('case', $bug->case, 'class="form-control"');?></td>
           </tr>
         </table>
       </fieldset>
diff --git a/module/bug/view/m.activate.html.php b/module/bug/view/m.activate.html.php
index c515e01018..04ff071c78 100755
--- a/module/bug/view/m.activate.html.php
+++ b/module/bug/view/m.activate.html.php
@@ -5,7 +5,7 @@
   <table class='table-1'>
     <tr>
       <td class='w-80px'><?php echo $lang->bug->assignedTo?></td>
-      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, 'class=select-3');?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control'");?></td>
     </tr>
     <tr>
       <td><?php echo $lang->bug->openedBuild;?></td>
diff --git a/module/bug/view/m.assignto.html.php b/module/bug/view/m.assignto.html.php
index 336a70df50..4ee3deb8e5 100755
--- a/module/bug/view/m.assignto.html.php
+++ b/module/bug/view/m.assignto.html.php
@@ -5,7 +5,7 @@
   <table class='table-1'>
     <tr>
       <td class='w-60px'><?php echo $lang->bug->assignedTo;?></td>
-      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='text-3'");?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control'");?></td>
     </tr>
     <tr>
       <td class='w-60px'><?php echo $lang->comment;?></td>
diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 0de14365b2..59498042e2 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -30,7 +30,7 @@
       <table class='table-1'>
         <caption>
           <div class='f-left'><?php echo $lang->bug->report->common;?></div>
-          <div class='f-right'><?php echo html::a($this->createLink('bug', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback);?></div>
+          <div class='text-right'><?php echo html::a($this->createLink('bug', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback);?></div>
         </caption>
         <?php foreach($charts as $chartType => $chartContent):?>
         <tr valign='top'>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index 1231a3d872..21a93908f2 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -25,15 +25,15 @@
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
-      <td><?php echo html::select('resolvedBuild', $builds, '', 'class=select-3');?></td>
+      <td><?php echo html::select('resolvedBuild', $builds, '', "class='form-control'");?></td>
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
-      <td><?php echo html::input('resolvedDate', helper::now(), "class='select-3'");?></td>
+      <td><?php echo html::input('resolvedDate', helper::now(), "class='form-control'");?></td>
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
-      <td><?php echo html::select('assignedTo', $users, $bug->openedBy, "class='select-3 chosen'");?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->openedBy, "class='form-control chosen'");?></td>
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
diff --git a/module/build/control.php b/module/build/control.php
index 66ab2d37e9..14b0ed34b8 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -214,7 +214,7 @@ class build extends control
     {
         if($varName == 'openedBuild' )  die(html::select($varName . '[]', $this->build->getProductBuildPairs($productID, 'noempty,release'), $build, 'size=4 class=select-3 multiple'));
         if($varName == 'openedBuilds' ) die(html::select($varName . "[$index][]", $this->build->getProductBuildPairs($productID, 'noempty,release'), $build, 'size=4 class=select-3 multiple'));
-        if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProductBuildPairs($productID, 'noempty,release'), $build, 'class=select-3'));
+        if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProductBuildPairs($productID, 'noempty,release'), $build, "class='form-control'"));
     }
 
     /**
@@ -242,7 +242,7 @@ class build extends control
             die($output);
         }
         if($varName == 'openedBuilds')  die(html::select($varName . "[$index][]", $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'size=4 class=select-3 multiple'));
-        if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'class=select-3'));
-        if($varName == 'testTaskBuild') die(html::select('build', $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'class=select-3'));
+        if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, "class='form-control'"));
+        if($varName == 'testTaskBuild') die(html::select('build', $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, "class='form-control'"));
     }
 }
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 188cf63669..ac0b1f58da 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -18,12 +18,12 @@
     <caption><?php echo $lang->build->create;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->build->product;?></th>
-      <td><?php echo html::select('product', $products, '', "class='select-3'");?></td>
+      <td><?php echo html::select('product', $products, '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->name;?></th>
       <td>
-        <?php echo html::input('name', '', "class='text-3'");?>
+        <?php echo html::input('name', '', "class='form-control'");?>
         <?php if($lastBuild) echo '<span class="gray">(' . $lang->build->last . ': ' . $lastBuild->name . ')</span>';?>
       </td>
     </tr>  
@@ -37,7 +37,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->scmPath;?></th>
-      <td><?php echo html::input('scmPath', '', "class='text-1'");?></td>
+      <td><?php echo html::input('scmPath', '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->packageType;?></th>
@@ -45,7 +45,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->filePath;?></th>
-      <td><?php echo html::input('filePath', '', "class='text-1'");?></td>
+      <td><?php echo html::input('filePath', '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->files;?></th>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index 079e6fcbb1..f1fd7a64a9 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -18,11 +18,11 @@
     <caption><?php echo $lang->build->edit;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->build->product;?></th>
-      <td><?php echo html::select('product', $products, $build->product, "class='select-3'");?></td>
+      <td><?php echo html::select('product', $products, $build->product, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->name;?></th>
-      <td><?php echo html::input('name', $build->name, "class='text-3'");?></td>
+      <td><?php echo html::input('name', $build->name, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->builder;?></th>
@@ -34,7 +34,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->scmPath;?></th>
-      <td><?php echo html::input('scmPath', $build->scmPath, "class='text-1'");?></td>
+      <td><?php echo html::input('scmPath', $build->scmPath, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->packageType;?></th>
@@ -42,7 +42,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->filePath;?></th>
-      <td><?php echo html::input('filePath', $build->filePath, "class='text-1'");?></td>
+      <td><?php echo html::input('filePath', $build->filePath, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->files;?></th>
diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php
index ff326cb6fc..f6d70b43f3 100644
--- a/module/company/view/edit.html.php
+++ b/module/company/view/edit.html.php
@@ -16,31 +16,31 @@
     <caption><?php echo $lang->company->edit;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->company->name;?></th>
-      <td><?php echo html::input('name', $company->name, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $company->name, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->company->phone;?></th>
-      <td><?php echo html::input('phone', $company->phone, "class='text-1'");?></td>
+      <td><?php echo html::input('phone', $company->phone, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->company->fax;?></th>
-      <td><?php echo html::input('fax', $company->fax, "class='text-1'");?></td>
+      <td><?php echo html::input('fax', $company->fax, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->company->address;?></th>
-      <td><?php echo html::input('address', $company->address, "class='text-1'");?></td>
+      <td><?php echo html::input('address', $company->address, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->company->zipcode;?></th>
-      <td><?php echo html::input('zipcode', $company->zipcode, "class='text-1'");?></td>
+      <td><?php echo html::input('zipcode', $company->zipcode, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->company->website;?></th>
-      <td><?php echo html::input('website', $company->website ? $company->website : 'http://', "class='text-1'");?></td>
+      <td><?php echo html::input('website', $company->website ? $company->website : 'http://', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->company->backyard;?></th>
-      <td><?php echo html::input('backyard', $company->backyard ? $company->backyard : 'http://', "class='text-1'");?></td>
+      <td><?php echo html::input('backyard', $company->backyard ? $company->backyard : 'http://', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->company->guest;?></th>
diff --git a/module/convert/view/convertIssue.html.php b/module/convert/view/convertIssue.html.php
index b94b65446d..42ab4100f1 100644
--- a/module/convert/view/convertIssue.html.php
+++ b/module/convert/view/convertIssue.html.php
@@ -10,7 +10,7 @@
     <?php foreach($trackers as $tracker):?>
     <tr>
       <th class='rowhead'><?php echo $tracker->name;?></th>
-      <td><?php html::select("$tracker->name", $lang->convert->directionList, '', "class='select-3'");?></td>
+      <td><?php html::select("$tracker->name", $lang->convert->directionList, '', "class='form-control'");?></td>
     </tr>
     <?php endforeach;?>
     <tr>
diff --git a/module/convert/view/setbugfree.html.php b/module/convert/view/setbugfree.html.php
index 098dd629ed..8137fe9cef 100644
--- a/module/convert/view/setbugfree.html.php
+++ b/module/convert/view/setbugfree.html.php
@@ -1,34 +1,34 @@
 <tr>
   <th class='rowhead w-200px'><?php echo $lang->convert->dbHost;?></th>
-  <td><?php echo html::input('dbHost', $config->db->host, "class='text-3'");?></td>
+  <td><?php echo html::input('dbHost', $config->db->host, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php echo $lang->convert->dbPort;?></th>
-  <td><?php echo html::input('dbPort', $config->db->port, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPort', $config->db->port, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php echo $lang->convert->dbUser;?></th>
-  <td><?php echo html::input('dbUser', $config->db->user, "class='text-3'");?></td>
+  <td><?php echo html::input('dbUser', $config->db->user, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php echo $lang->convert->dbPassword;?></th>
-  <td><?php echo html::input('dbPassword', $config->db->password, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPassword', $config->db->password, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php printf($lang->convert->dbName, $source);?></th>
-  <td><?php echo html::input('dbName', $dbName, "class='text-3'");?></td>
+  <td><?php echo html::input('dbName', $dbName, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php printf($lang->convert->dbCharset, $source);?></th>
-  <td><?php echo html::input('dbCharset', $dbCharset, "class='text-3'");?></td>
+  <td><?php echo html::input('dbCharset', $dbCharset, "class='form-control'");?></td>
 </tr>
 <?php if($version > 1):?>
 <tr>
   <th class='rowhead'><?php printf($lang->convert->dbPrefix, $source);?></th>
-  <td><?php echo html::input('dbPrefix', $tablePrefix, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPrefix', $tablePrefix, "class='form-control'");?></td>
 </tr>
 <?php endif;?>
 <tr>
   <th class='rowhead'><?php printf($lang->convert->installPath, $source);?></th>
-  <td><?php echo html::input('installPath', '', "class='text-3'");?></td>
+  <td><?php echo html::input('installPath', '', "class='form-control'");?></td>
 </tr>
diff --git a/module/convert/view/setredmine.html.php b/module/convert/view/setredmine.html.php
index fd459f6e03..646d7433cf 100644
--- a/module/convert/view/setredmine.html.php
+++ b/module/convert/view/setredmine.html.php
@@ -1,28 +1,28 @@
 <tr>
   <th class='rowhead w-200px'><?php echo $lang->convert->dbHost;?></th>
-  <td><?php echo html::input('dbHost', $config->db->host, "class='text-3'");?></td>
+  <td><?php echo html::input('dbHost', $config->db->host, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php echo $lang->convert->dbPort;?></th>
-  <td><?php echo html::input('dbPort', $config->db->port, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPort', $config->db->port, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php echo $lang->convert->dbUser;?></th>
-  <td><?php echo html::input('dbUser', $config->db->user, "class='text-3'");?></td>
+  <td><?php echo html::input('dbUser', $config->db->user, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php echo $lang->convert->dbPassword;?></th>
-  <td><?php echo html::input('dbPassword', $config->db->password, "class='text-3'");?></td>
+  <td><?php echo html::input('dbPassword', $config->db->password, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php printf($lang->convert->dbName, $source);?></th>
-  <td><?php echo html::input('dbName', $dbName, "class='text-3'");?></td>
+  <td><?php echo html::input('dbName', $dbName, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php printf($lang->convert->dbCharset, $source);?></th>
-  <td><?php echo html::input('dbCharset', $dbCharset, "class='text-3'");?></td>
+  <td><?php echo html::input('dbCharset', $dbCharset, "class='form-control'");?></td>
 </tr>
 <tr>
   <th class='rowhead'><?php printf($lang->convert->installPath, $source);?></th>
-  <td><?php echo html::input('installPath', '', "class='text-3'");?></td>
+  <td><?php echo html::input('installPath', '', "class='form-control'");?></td>
 </tr>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 704325399f..943f5082a4 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -16,7 +16,7 @@
 $itemRow = <<<EOT
   <tr class='text-center'>
     <td>
-      <input type='text' class="text-1"  value="" name="keys[]">
+      <input type='text' class="form-control"  value="" name="keys[]">
       <input type='hidden' value="0" name="systems[]">
     </td>
     <td>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 6ecf68e1e3..e13240afed 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -23,7 +23,7 @@ var browseType = '<?php echo $browseType;?>';
     <span id='bymoduleTab' onclick='browseByModule()'><a href='#'><?php echo $lang->doc->moduleDoc;?></a></span>
     <span id='bysearchTab'><a href='#' class='link-icon'><i class='icon-search icon icon-large'></i>&nbsp;<?php echo $lang->doc->searchDoc;?></a></span>
   </div>
-  <div class='f-right'>
+  <div class='text-right'>
     <?php common::printIcon('doc', 'create', "libID=$libID&moduleID=$moduleID&productID=$productID&projectID=$projectID&from=doc");?>
   </div>
 </div>
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index 782205ffad..c743e41b5e 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -16,7 +16,7 @@
     <caption><?php echo $lang->doc->createLib;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->doc->libName;?></th>
-      <td><?php echo html::input('name', '', "class='text-1'");?></td>
+      <td><?php echo html::input('name', '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index 4241006bf2..0941203829 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -19,7 +19,7 @@
     <caption><?php echo $lang->doc->editLib;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->doc->libName;?></th>
-      <td><?php echo html::input('name', $libName, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $libName, "class='form-control'");?></td>
     </tr>  
     <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php
index dce3fda8ca..7f7840a614 100644
--- a/module/extension/view/obtain.html.php
+++ b/module/extension/view/obtain.html.php
@@ -26,7 +26,7 @@
       <div class='box-title'><?php echo $lang->extension->bySearch;?></div>
       <div class='box-content a-center'>
         <form class='side-search' method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
-        <?php echo html::input('key', $this->post->key, "class='text-1'") . html::submitButton($lang->extension->bySearch);?>
+        <?php echo html::input('key', $this->post->key, "class='form-control'") . html::submitButton($lang->extension->bySearch);?>
         </form>
       </div>
       <div class='box-title'><?php echo $lang->extension->byCategory;?></div>
@@ -45,7 +45,7 @@
         <table class='table-1 exttable'>
           <caption>
             <div class='f-left'><?php echo $extension->name . "($currentRelease->releaseVersion)";?></div>
-            <div class='f-right'>
+            <div class='text-right'>
               <?php 
               if($latestRelease and $latestRelease->releaseVersion != $currentRelease->releaseVersion) 
               {
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index 94b8123c69..c95c7fdf64 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -16,7 +16,7 @@
 <table align='center' class='table-1 tablesorter fixed' id='groupList'>
   <caption class='caption-tl pb-10px'>
     <div class='f-left'><?php echo $lang->group->browse;?></div>
-    <div class='f-right'><?php common::printIcon('group', 'create');?></div>
+    <div class='text-right'><?php common::printIcon('group', 'create');?></div>
   </caption>
   <thead>
   <tr class='colhead'>
diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php
index 59129d4a71..68184bea50 100644
--- a/module/group/view/copy.html.php
+++ b/module/group/view/copy.html.php
@@ -16,7 +16,7 @@
     <caption><?php echo $lang->group->copy;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->group->name;?></th>
-      <td><?php echo html::input('name', $group->name, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $group->name, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->group->desc;?></th>
diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php
index 0133c60f88..bbb8c7669b 100644
--- a/module/group/view/edit.html.php
+++ b/module/group/view/edit.html.php
@@ -16,7 +16,7 @@
     <caption><?php echo $lang->group->edit;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->group->name;?></th>
-      <td><?php echo html::input('name', $group->name, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $group->name, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->group->desc;?></th>
diff --git a/module/install/view/step2.html.php b/module/install/view/step2.html.php
index 7f46bf6618..05c56f8c6d 100644
--- a/module/install/view/step2.html.php
+++ b/module/install/view/step2.html.php
@@ -20,7 +20,7 @@
     </tr>
     <tr>
       <th><?php echo $lang->install->defaultLang;?></th>
-      <td><?php echo html::select('defaultLang', $config->langs, $app->getClientLang(), 'class=select-3');?></td>
+      <td><?php echo html::select('defaultLang', $config->langs, $app->getClientLang(), "class='form-control'");?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbHost;?></th>
diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php
index d2a5b2f1e1..b8a26b6460 100755
--- a/module/mail/view/edit.html.php
+++ b/module/mail/view/edit.html.php
@@ -44,7 +44,7 @@ include '../../common/view/header.html.php';
   </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->mail->password; ?></th>
-    <td><?php echo html::password('password', $mailConfig->password, 'class="text-3" autocomplete="off"') ?></td>
+    <td><?php echo html::password('password', $mailConfig->password, 'class="form-control" autocomplete="off"') ?></td>
   </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->mail->secure; ?></th>
diff --git a/module/mail/view/test.html.php b/module/mail/view/test.html.php
index 004f1aae18..b72f8ef623 100755
--- a/module/mail/view/test.html.php
+++ b/module/mail/view/test.html.php
@@ -21,7 +21,7 @@ if(isset($error))
 <table class='table-4' align='center'>
   <caption>
     <div class='f-left'> <?php echo $lang->mail->test;?></div>
-    <div class='f-right'><?php echo $lang->mail->sendmailTips;?></div>
+    <div class='text-right'><?php echo $lang->mail->sendmailTips;?></div>
   </caption>
   <tr>
     <td class='text-center'>
diff --git a/module/product/control.php b/module/product/control.php
index 65820e81d5..93e011a7fd 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -475,7 +475,7 @@ class product extends control
     public function ajaxGetPlans($productID, $planID = 0, $needCreate = false)
     {
         $plans = $this->loadModel('productplan')->getPairs($productID);
-        $output = html::select('plan', $plans, $planID, "class='select-3'");
+        $output = html::select('plan', $plans, $planID, "class='form-control'");
         if(count($plans) == 1 and $needCreate) 
         {
             $output .= html::a($this->createLink('productplan', 'create', "productID=$productID"), $this->lang->productplan->create, '_blank');
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 4c9ff5a03f..8da4edc616 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -25,8 +25,8 @@
     <?php foreach($productIDList as $productID):?>
     <tr class='text-center'>
       <td><?php echo sprintf('%03d', $productID) . html::hidden("productIDList[$productID]", $productID);?></td>
-      <td><?php echo html::input("names[$productID]", $products[$productID]->name, "class='text-1'");?></td>
-      <td><?php echo html::input("codes[$productID]", $products[$productID]->code, "class='text-1'");?></td>
+      <td><?php echo html::input("names[$productID]", $products[$productID]->name, "class='form-control'");?></td>
+      <td><?php echo html::input("codes[$productID]", $products[$productID]->code, "class='form-control'");?></td>
       <td><?php echo html::select("POs[$productID]",  $poUsers, $products[$productID]->PO);?></td>
       <td><?php echo html::select("QDs[$productID]",  $qdUsers, $products[$productID]->QD);?></td>
       <td><?php echo html::select("RDs[$productID]",  $rdUsers, $products[$productID]->RD);?></td>
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 28680daa36..fe80c03a0d 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -193,7 +193,7 @@ class productplan extends control
     public function ajaxGetProductplans($productID)
     {
         $plans = $this->productplan->getPairs($productID);
-        die(html::select('plan', $plans, '', 'class=select-3'));
+        die(html::select('plan', $plans, '', "class='form-control'"));
     }
 
     /**
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index ecdd2ef4cf..e5d7e27799 100755
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -27,8 +27,8 @@
   <?php foreach($projectIDList as $projectID):?>
   <tr class='text-center'>
     <td><?php echo sprintf('%03d', $projectID) . html::hidden("projectIDList[$projectID]", $projectID);?></td>
-    <td><?php echo html::input("names[$projectID]",     $projects[$projectID]->name, "class='text-1'");?></td>
-    <td><?php echo html::input("codes[$projectID]",     $projects[$projectID]->code, "class='text-1'");?></td>
+    <td><?php echo html::input("names[$projectID]",     $projects[$projectID]->name, "class='form-control'");?></td>
+    <td><?php echo html::input("codes[$projectID]",     $projects[$projectID]->code, "class='form-control'");?></td>
     <td><?php echo html::select("PMs[$projectID]",      $pmUsers, $projects[$projectID]->PM, 'class=text-1');?></td>
     <td><?php echo html::select("statuses[$projectID]", $lang->project->statusList, $projects[$projectID]->status, 'class=text-1');?></td>
     <td><?php echo html::input("begins[$projectID]",    $projects[$projectID]->begin, "class='text-1 w-date date' onchange='computeWorkDays(this.id)'");?></td>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index d9b30f62f9..0688cd6151 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -36,21 +36,21 @@ $(document).ready(function()
   <table align='center' class='table-1 a-left'> 
     <caption>
       <div class='f-left'><?php echo $lang->project->create;?></div>
-      <div class='f-right'><?php echo html::checkbox('', $lang->project->copy . '?', '', 'onclick=switchCopyProject(this);');?></div>
+      <div class='text-right'><?php echo html::checkbox('', $lang->project->copy . '?', '', 'onclick=switchCopyProject(this);');?></div>
     </caption>
     <?php if($projects):?>
     <tr id='copyProjectBox' <?php if($copyProjectID == 0) echo "class='hidden'";?>>
       <th class='rowhead'><?php echo $lang->project->copy;?></th>
-      <td><?php echo html::select('', $projects, $copyProjectID, "class='select-3' onchange=setCopyProject(this.value)");?></td>
+      <td><?php echo html::select('', $projects, $copyProjectID, "class='form-control' onchange=setCopyProject(this.value)");?></td>
     </tr>  
     <?php endif;?>
     <tr>
       <th class='rowhead'><?php echo $lang->project->name;?></th>
-      <td><?php echo html::input('name', $name, "class='text-3'");?></td>
+      <td><?php echo html::input('name', $name, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->code;?></th>
-      <td><?php echo html::input('code', $code, "class='text-3'");?></td>
+      <td><?php echo html::input('code', $code, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->begin;?></th>
@@ -65,15 +65,15 @@ $(document).ready(function()
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->project->days;?></th>
-      <td><?php echo html::input('days', '', "class='text-3'") . $lang->project->day;?></td>
+      <td><?php echo html::input('days', '', "class='form-control'") . $lang->project->day;?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->teamname;?></th>
-      <td><?php echo html::input('team', $team, "class='text-3'");?></td>
+      <td><?php echo html::input('team', $team, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->type;?></th>
-      <td><?php echo html::select('type', $lang->project->typeList, '', "class='text-3'") . $lang->project->typeDesc;?></td>
+      <td><?php echo html::select('type', $lang->project->typeList, '', "class='form-control'") . $lang->project->typeDesc;?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 4873f62422..e1e3f91078 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -19,11 +19,11 @@
     <caption><?php echo $lang->project->edit;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->project->name;?></th>
-      <td><?php echo html::input('name', $project->name, "class='text-3'");?></td>
+      <td><?php echo html::input('name', $project->name, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->code;?></th>
-      <td><?php echo html::input('code', $project->code, "class='text-3'");?></td>
+      <td><?php echo html::input('code', $project->code, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->begin;?></th>
@@ -35,15 +35,15 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->days;?></th>
-      <td><?php echo html::input('days', $project->days, "class='text-3'") . $lang->project->day;?></td>
+      <td><?php echo html::input('days', $project->days, "class='form-control'") . $lang->project->day;?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->type;?></th>
-      <td><?php echo html::select('type', $lang->project->typeList, $project->type, "class='text-3'");?></td>
+      <td><?php echo html::select('type', $lang->project->typeList, $project->type, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->teamname;?></th>
-      <td><?php echo html::input('team', $project->team, "class='text-3'");?></td>
+      <td><?php echo html::input('team', $project->team, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->status;?></th>
diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php
index f31e29c6e0..da32a19477 100755
--- a/module/project/view/importbug.html.php
+++ b/module/project/view/importbug.html.php
@@ -52,7 +52,7 @@ var browseType = '<?php echo $browseType;?>';
     </tr>
     <?php endforeach;?>
     </tbody>
-    <tr><td colspan='9'><div class='f-right'><?php $pager->show();?></div></td></tr>
+    <tr><td colspan='9'><div class='text-right'><?php $pager->show();?></div></td></tr>
   </table>
   <div><?php echo html::selectAll() . html::selectReverse() . html::submitButton($lang->import) . html::backButton();?></div>
 </form>
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 98f5c74fbd..057f3b4a65 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -17,7 +17,7 @@
   <table align='center' class='table-4 a-center'> 
     <caption>
       <div class='f-left'><?php echo $lang->project->manageMembers;?></div>
-      <div class='f-right'><?php echo html::select('teams2Import', $teams2Import, $team2Import, 'onchange=importTeam()');?></div>
+      <div class='text-right'><?php echo html::select('teams2Import', $teams2Import, $team2Import, 'onchange=importTeam()');?></div>
     </caption>
     <tr>
       <th><?php echo $lang->team->account;?></th>
diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index 696be9dc3d..acd4731f4f 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -27,7 +27,7 @@
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->project->days;?></th>
-      <td><?php echo html::input('days', $project->days, "class='text-3'") . $lang->project->day;?></td>
+      <td><?php echo html::input('days', $project->days, "class='form-control'") . $lang->project->day;?></td>
     </tr>  
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index a93bfcc26f..1c0d934dfc 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -109,7 +109,7 @@
             <table class='table table-hover table-condensed table-borderless'>
               <caption class='caption-t1'>
                 <?php echo $lang->release->bugs;?>
-                <div class='f-right'></div>
+                <div class='text-right'></div>
               </caption>
               <thead>
                 <tr>
diff --git a/module/sso/view/browse.html.php b/module/sso/view/browse.html.php
index ff385a2b75..563dd5d696 100644
--- a/module/sso/view/browse.html.php
+++ b/module/sso/view/browse.html.php
@@ -2,7 +2,7 @@
 <table class='table-1 fixed colored tablesorter datatable'>
   <caption class='caption-tl pb-10px'>
     <div class='f-left'><?php echo $lang->sso->browse;?></div>
-    <div class='f-right'>
+    <div class='text-right'>
       <?php common::printIcon('sso', 'create');?>
     </div>
   </caption>
diff --git a/module/sso/view/create.html.php b/module/sso/view/create.html.php
index c941de934e..4cff9baeef 100644
--- a/module/sso/view/create.html.php
+++ b/module/sso/view/create.html.php
@@ -4,16 +4,16 @@
     <caption><?php echo $lang->sso->create;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->sso->title;?></th>
-      <td><?php echo html::input('title', '', "class='text-3' placeholder='{$lang->sso->note->title}'");?></td>
+      <td><?php echo html::input('title', '', "class='form-control' placeholder='{$lang->sso->note->title}'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->sso->code;?></th>
-      <td><?php echo html::input('code', '', "class='text-3' placeholder='{$lang->sso->note->code}'");?></td>
+      <td><?php echo html::input('code', '', "class='form-control' placeholder='{$lang->sso->note->code}'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->sso->key;?></th>
       <td>
-        <?php echo html::input('key', $key, "class='text-3' readonly='readonly'");?>
+        <?php echo html::input('key', $key, "class='form-control' readonly='readonly'");?>
         <?php echo html::a('javascript:void(0)', $lang->sso->createKey, '', 'onclick="createKey()"')?>
       </td>
     </tr>
diff --git a/module/sso/view/edit.html.php b/module/sso/view/edit.html.php
index 25b8ac3af5..dbb0fe4fe2 100644
--- a/module/sso/view/edit.html.php
+++ b/module/sso/view/edit.html.php
@@ -4,7 +4,7 @@
     <caption><?php echo $lang->sso->edit;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->sso->title;?></th>
-      <td><?php echo html::input('title', $auth->title, "class='text-3'");?></td>
+      <td><?php echo html::input('title', $auth->title, "class='form-control'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->sso->code;?></th>
@@ -13,7 +13,7 @@
     <tr>
       <th class='rowhead'><?php echo $lang->sso->key;?></th>
       <td>
-        <?php echo html::input('key', $auth->key, "class='text-3' readonly='readonly'");?>
+        <?php echo html::input('key', $auth->key, "class='form-control' readonly='readonly'");?>
         <?php echo html::a('javascript:void(0)', $lang->sso->createKey, '', 'onclick="createKey()"')?>
       </td>
     </tr>
diff --git a/module/story/control.php b/module/story/control.php
index 9dde7dc7e1..510ab939d5 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -808,7 +808,7 @@ class story extends control
             $moduleID = $this->tree->getAllChildID($moduleID);
         }
         $stories = $this->story->getProductStoryPairs($productID, $moduleID);
-        $select  = html::select('story', $stories, $storyID, "class='select-3'");
+        $select  = html::select('story', $stories, $storyID, "class='form-control'");
 
         /* If only need options, remove select wrap. */
         if($onlyOption == 'true') die(substr($select, strpos($select, '>') + 1, -10));
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index fbd837200d..5db2909e8a 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -31,11 +31,11 @@
       <td><?php echo $i+1;?></td>
       <td><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, 'class=select-1');?></td>
       <td><?php echo html::select("plan[$i]", $plans, $planID, 'class=select-1');?></td>
-      <td><?php echo html::input("title[$i]", $storyTitle, "class='text-1'");?></td>
-      <td><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='text-1'");?></td>
+      <td><?php echo html::input("title[$i]", $storyTitle, "class='form-control'");?></td>
+      <td><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control'");?></td>
       <td><?php echo html::select("pri[$i]", (array)$lang->story->priList, $pri, 'class=select-1');?></td>
-      <td><?php echo html::input("estimate[$i]", $estimate, "class='text-1'");?></td>
-      <td><?php echo html::select("needReview[$i]", $lang->story->reviewList, 0, "class='text-1'");?></td>
+      <td><?php echo html::input("estimate[$i]", $estimate, "class='form-control'");?></td>
+      <td><?php echo html::select("needReview[$i]", $lang->story->reviewList, 0, "class='form-control'");?></td>
     </tr>  
     <?php endfor;?>
     <tr><td colspan='8' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index de5698bc2a..d580ba43b1 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -13,88 +13,95 @@
 <?php include './header.html.php';?>
 <?php include '../../common/view/form.html.php';?>
 <?php js::set('holders', $lang->story->placeholder); ?>
-<form method='post' enctype='multipart/form-data' id='dataform' class='ajaxForm'>
-  <table align='center' class='table-1'> 
-    <caption><?php echo $lang->story->create;?></caption>
-    <tr>
-      <th class='rowhead'><?php echo $lang->story->product;?></th>
-      <td>
-        <?php echo html::select('product', $products, $productID, "onchange=loadProduct(this.value); class='select-3'");?>
-        <span id='moduleIdBox'>
-        <?php 
-        echo html::select('module', $moduleOptionMenu, $moduleID);
-        if(count($moduleOptionMenu) == 1)
-        {
-            echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=story"), $lang->tree->manage, '_blank');
-            echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
-        }
-        ?>
-        </span>
-      </td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->story->plan;?></th>
-      <td>
-        <span id='planIdBox'>
-        <?php 
-        echo html::select('plan', $plans, $planID, 'class=select-3');
-        if(count($plans) == 1) 
-        {
-            echo html::a($this->createLink('productplan', 'create', "productID=$productID"), $lang->productplan->create, '_blank');
-            echo html::a("javascript:loadProductPlans($productID)", $lang->refresh);
-        }
-        ?>
-        </span>
-      </td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->story->source;?></th>
-      <td><?php echo html::select('source', $lang->story->sourceList, $source, 'class=select-3');?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->story->title;?></th>
-      <td><?php echo html::input('title', $storyTitle, "class='text-1'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->story->spec;?></th>
-      <td><?php echo html::textarea('spec', $spec, "rows='9' class='text-1'");?><br /><?php echo $lang->story->specTemplate;?></td>
-    </tr>  
+<div class='container'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
+      <strong><small class='text-muted'><i class='icon icon-plus'></i></small> <?php echo $lang->story->create;?></strong>
+    </div>
+  </div>
+  <form class='form-condensed' method='post' enctype='multipart/form-data' id='dataform' class='ajaxForm'>
+    <table class='table table-form'> 
+      <tr>
+        <th><?php echo $lang->story->product;?></th>
+        <td>
+          <?php echo html::select('product', $products, $productID, "onchange=loadProduct(this.value); class='form-control'");?>
+          <span id='moduleIdBox'>
+          <?php 
+          echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control'");
+          if(count($moduleOptionMenu) == 1)
+          {
+              echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=story"), $lang->tree->manage, '_blank');
+              echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
+          }
+          ?>
+          </span>
+        </td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->story->plan;?></th>
+        <td>
+          <span id='planIdBox'>
+          <?php 
+          echo html::select('plan', $plans, $planID, "class='form-control'");
+          if(count($plans) == 1) 
+          {
+              echo html::a($this->createLink('productplan', 'create', "productID=$productID"), $lang->productplan->create, '_blank');
+              echo html::a("javascript:loadProductPlans($productID)", $lang->refresh);
+          }
+          ?>
+          </span>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->story->source;?></th>
+        <td><?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->story->title;?></th>
+        <td><?php echo html::input('title', $storyTitle, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->story->spec;?></th>
+        <td><?php echo html::textarea('spec', $spec, "rows='9' class='form-control'");?><br /><?php echo $lang->story->specTemplate;?></td>
+      </tr>  
+         <tr>
+        <th><?php echo $lang->story->verify;?></th>
+        <td><?php echo html::textarea('verify', $verify, "rows='6' class='form-control'");?></td>
+      </tr> 
        <tr>
-      <th class='rowhead'><?php echo $lang->story->verify;?></th>
-      <td><?php echo html::textarea('verify', $verify, "rows='6' class='text-1'");?></td>
-    </tr> 
-     <tr>
-      <th class='rowhead'><?php echo $lang->story->pri;?></th>
-      <td><?php echo html::select('pri', (array)$lang->story->priList, $pri, 'class=select-3');?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->story->estimate;?></th>
-      <td><?php echo html::input('estimate', $estimate, "class='text-3'") . $lang->story->hour;?></td>
-    </tr> 
-    <tr>
-      <th class='rowhead'><?php echo $lang->story->reviewedBy;?></th>
-      <td><?php echo html::select('assignedTo', $users, '', "class='select-3 chosen'") . html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview'");?></td>
-    </tr>  
-     <tr>
-      <th class='rowhead'><nobr><?php echo $lang->story->mailto;?></nobr></th>
-      <td>
-        <?php 
-        echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "multiple"); 
-        if($contactLists) echo html::select('', $contactLists, '', "class='f-right' onchange=\"setMailto('mailto', this.value)\"");
-        ?>
-      </td>
-    </tr>
+        <th><?php echo $lang->story->pri;?></th>
+        <td><?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->story->estimate;?></th>
+        <td><?php echo html::input('estimate', $estimate, "class='form-control'") . $lang->story->hour;?></td>
+      </tr> 
+      <tr>
+        <th><?php echo $lang->story->reviewedBy;?></th>
+        <td><?php echo html::select('assignedTo', $users, '', "class='form-control chosen'") . html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview'");?></td>
+      </tr>  
+       <tr>
+        <th><nobr><?php echo $lang->story->mailto;?></nobr></th>
+        <td>
+          <?php 
+          echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "multiple"); 
+          if($contactLists) echo html::select('', $contactLists, '', "class='text-right' onchange=\"setMailto('mailto', this.value)\"");
+          ?>
+        </td>
+      </tr>
 
-    <tr>
-      <th class='rowhead'><nobr><?php echo $lang->story->keywords;?></nobr></th>
-      <td><?php echo html::input('keywords', $keywords, 'class="text-1"');?></td>
-    </tr>
-   <tr>
-      <th class='rowhead'><?php echo $lang->story->legendAttatch;?></th>
-      <td><?php echo $this->fetch('file', 'buildform');?></td>
-    </tr>  
-    <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-  </table>
-  <span id='responser'></span>
-</form>
+      <tr>
+        <th><nobr><?php echo $lang->story->keywords;?></nobr></th>
+        <td><?php echo html::input('keywords', $keywords, 'class="form-control"');?></td>
+      </tr>
+     <tr>
+        <th><?php echo $lang->story->legendAttatch;?></th>
+        <td><?php echo $this->fetch('file', 'buildform');?></td>
+      </tr>  
+      <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    </table>
+    <span id='responser'></span>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/report.html.php b/module/story/view/report.html.php
index 82fc676f12..60facbc692 100644
--- a/module/story/view/report.html.php
+++ b/module/story/view/report.html.php
@@ -30,7 +30,7 @@
       <table class='table-1'>
         <caption>
           <div class='f-left'><?php echo $lang->story->report->common;?></div>
-          <div class='f-right'><?php echo html::a($this->createLink('product', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback); ?></div>
+          <div class='text-right'><?php echo html::a($this->createLink('product', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback); ?></div>
         </caption>
         <?php foreach($charts as $chartType => $chartContent):?>
         <tr valign='top'>
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index bdea7e72b7..e43b37b621 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -17,11 +17,11 @@
     <caption><?php echo $task->name;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='select-3'");?></td>
+      <td><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->task->left;?></th>
-      <td><?php echo html::input('left', '', "class='text-3'") . $lang->task->hour;?></td>
+      <td><?php echo html::input('left', '', "class='form-control'") . $lang->task->hour;?></td>
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php
index 75a4b3783d..1de33032d4 100644
--- a/module/task/view/report.html.php
+++ b/module/task/view/report.html.php
@@ -31,7 +31,7 @@
       <table class='table-1'>
         <caption>
           <div class='f-left'><?php echo $lang->task->report->common;?></div>
-          <div class='f-right'><?php echo html::a($this->createLink('project', 'task', "projectID=$projectID&browseType=$browseType"), $lang->goback);?></div>
+          <div class='text-right'><?php echo html::a($this->createLink('project', 'task', "projectID=$projectID&browseType=$browseType"), $lang->goback);?></div>
         </caption>
         <?php foreach($charts as $chartType => $chartContent):?>
         <tr valign='top'>
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index 741db2e08f..7c75705242 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -33,7 +33,7 @@
       <td><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class=select-1");?></td>
       <td><?php echo html::select("type[$i]", $lang->testcase->typeList, $type, "class=select-1");?></td>
       <?php if(!$story):?><td class='text-left'style='overflow:visible'><?php echo html::select("story[$i]", '', '', 'class="select-1 storySelect"');?></td><?php endif;?>
-      <td><?php echo html::input("title[$i]", '', "class='text-1'");?></td>
+      <td><?php echo html::input("title[$i]", '', "class='form-control'");?></td>
     </tr>
     <?php endfor;?>
     <tr><td colspan='<?php $story ? print '4' : print '5'?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index b3f42e2691..a777a3f234 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -29,7 +29,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
     echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#' class='link-icon'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></span> ";
     ?>
   </div>
-  <div class='f-right'>
+  <div class='text-right'>
     <?php 
     common::printIcon('testcase', 'import', "productID=$productID", '', 'button', '', '', 'export cboxElement');
 
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index ab6495c594..7ba7f3600a 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -22,7 +22,7 @@
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->lblProductAndModule;?></th>
       <td>
-        <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='select-3'");?>
+        <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control'");?>
         <span id='moduleIdBox'>
         <?php 
         echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange=loadModuleRelated();");
@@ -37,20 +37,20 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->type;?></th>
-      <td><?php echo html::select('type', $lang->testcase->typeList, $type, 'class=select-3');?></td>
+      <td><?php echo html::select('type', $lang->testcase->typeList, $type, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->stage;?></th>
-      <td><?php echo html::select('stage[]', $lang->testcase->stageList, $stage, "class='select-3' multiple='multiple'");?></td>
+      <td><?php echo html::select('stage[]', $lang->testcase->stageList, $stage, "class='form-control' multiple='multiple'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->pri;?></th>
-      <td><?php echo html::select('pri', $lang->testcase->priList, $pri, 'class=select-3');?></td>
+      <td><?php echo html::select('pri', $lang->testcase->priList, $pri, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->lblStory;?></th>
       <td>
-        <div id='storyIdBox'><?php echo html::select('story', $stories, $storyID, 'class="text-1" onchange=setPreview();');?>
+        <div id='storyIdBox'><?php echo html::select('story', $stories, $storyID, 'class="form-control" onchange=setPreview();');?>
         <?php if($storyID == 0): ?>
           <a href='' id='preview' class='iframe hidden'><?php echo $lang->preview;?></a>
         <?php else:?>
@@ -61,11 +61,11 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->title;?></th>
-      <td><?php echo html::input('title', $caseTitle, "class='text-1'");?></td>
+      <td><?php echo html::input('title', $caseTitle, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->precondition;?></th>
-      <td><?php echo html::textarea('precondition', $precondition, " rows='4' class='text-1'");?></td>
+      <td><?php echo html::textarea('precondition', $precondition, " rows='4' class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->steps;?></th>
@@ -98,7 +98,7 @@
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->keywords;?></th>
-      <td><?php echo html::input('keywords', $keywords, "class='text-1'");?></td>
+      <td><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
     </tr>  
      <tr>
       <th class='rowhead'><?php echo $lang->testcase->files;?></th>
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 4a1477f198..a06c68d487 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -39,7 +39,7 @@
       echo html::hidden("product[$key]", $productID);
       ?>
     </td>
-    <td><?php echo html::input("title[$key]", $case->title, "class='text-1' style='margin-top:2px'")?></td>
+    <td><?php echo html::input("title[$key]", $case->title, "class='form-control' style='margin-top:2px'")?></td>
     <td><?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='select-2'")?></td>
     <td><?php echo html::select("story[$key]", $stories, isset($case->story) ? $case->story : (!empty($case->id) ? $cases[$case->id]->story : ''), "class='select-2'")?></td>
     <td><?php echo html::select("pri[$key]", $lang->testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''))?></td>
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index aac6780e63..6a4440ecd3 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -46,7 +46,7 @@ table .table-1 td{border:0px;}
             <td align='left' width='30%'><?php echo "<span title='$step->desc'>" . $i . "、" . $step->desc . '</span>'?></td>
             <td align='left' width='30%'><?php echo "<span title='$step->expect'>" . $lang->testcase->stepExpect . "：" . $step->expect . '</span>'?></td>
             <td width='50' class='hidden action<?php echo $caseID?>'><?php echo html::select("steps[$caseID][$stepID]", $lang->testcase->resultList, 'pass')?></td>
-            <td class='hidden action<?php echo $caseID?>'><?php echo html::input("reals[$caseID][$stepID]", '', "class='text-1'");?></td>
+            <td class='hidden action<?php echo $caseID?>'><?php echo html::input("reals[$caseID][$stepID]", '', "class='form-control'");?></td>
           </tr>
           <?php $i++?>
           <?php endforeach?>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 066771de32..885d8bb45a 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -16,7 +16,7 @@
 <table class='table-1 colored tablesorter fixed' id='taskList'>
   <caption class='caption-tl'>
     <div class='f-left'><?php echo $lang->testtask->browse;?></div>
-    <div class='f-right'><?php common::printIcon('testtask', 'create', "product=$productID");?></div>
+    <div class='text-right'><?php common::printIcon('testtask', 'create', "product=$productID");?></div>
   </caption>
   <thead>
   <?php $vars = "productID=$productID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 97df94de38..ec08e3649b 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -28,7 +28,7 @@ var moduleID   = '<?php echo $moduleID;?>';
     echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#' class='link-icon'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></span> ";
     ?>
   </div>
-  <div class='f-right'>
+  <div class='text-right'>
     <?php
     common::printIcon('testtask', 'linkCase', "taskID=$task->id");
     common::printIcon('testcase', 'export', "productID=$productID&orderBy=`case`_desc&taskID=$task->id");
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index 20797fa668..b7f408420e 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -19,12 +19,12 @@
     <?php if(isset($projectID)):?>
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->product;?></th>
-      <td><?php echo html::select('product', $products, '', 'class=select-3');?></td>
+      <td><?php echo html::select('product', $products, '', "class='form-control'");?></td>
     </tr>  
     <?php else:?>
     <tr class='hidden'>
       <th><?php echo $lang->testtask->product;?></th>
-      <td><?php echo html::input('product', $productID, 'class=select-3');?></td>
+      <td><?php echo html::input('product', $productID, "class='form-control'");?></td>
     </tr>  
     <?php endif;?>
     <tr>
@@ -33,15 +33,15 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->build;?></th>
-      <td><span id='buildBox'><?php echo html::select('build', $builds, '', 'class=select-3');?></span></td>
+      <td><span id='buildBox'><?php echo html::select('build', $builds, '', "class='form-control'");?></span></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
-      <td><?php echo html::select('owner', $users, '', "class='select-3 chosen'");?></td>
+      <td><?php echo html::select('owner', $users, '', "class='form-control chosen'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->pri;?></th>
-      <td><?php echo html::select('pri', $lang->testtask->priList, 0, 'class=select-3');?></td>
+      <td><?php echo html::select('pri', $lang->testtask->priList, 0, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
@@ -53,11 +53,11 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->status;?></th>
-      <td><?php echo html::select('status', $lang->testtask->statusList, '',  "class='select-3'");?></td>
+      <td><?php echo html::select('status', $lang->testtask->statusList, '',  "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->name;?></th>
-      <td><?php echo html::input('name', '', "class='text-1'");?></td>
+      <td><?php echo html::input('name', '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->desc;?></th>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 1c145323c3..f55d4db79a 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -18,19 +18,19 @@
     <caption><?php echo $lang->testtask->edit;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->project;?></th>
-      <td><?php echo html::select('project', $projects, $task->project, 'class=select-3');?></td>
+      <td><?php echo html::select('project', $projects, $task->project, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->build;?></th>
-      <td><?php echo html::select('build', $builds, $task->build, 'class=select-3');?></td>
+      <td><?php echo html::select('build', $builds, $task->build, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
-      <td><?php echo html::select('owner', $users, $task->owner, "class='select-3 chosen'");?></td>
+      <td><?php echo html::select('owner', $users, $task->owner, "class='form-control chosen'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->pri;?></th>
-      <td><?php echo html::select('pri', $lang->testtask->priList, $task->pri, 'class=select-3');?></td>
+      <td><?php echo html::select('pri', $lang->testtask->priList, $task->pri, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
@@ -42,11 +42,11 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->status;?></th>
-      <td><?php echo html::select('status', $lang->testtask->statusList, $task->status,  "class='select-3'");?></td>
+      <td><?php echo html::select('status', $lang->testtask->statusList, $task->status,  "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->name;?></th>
-      <td><?php echo html::input('name', $task->name, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $task->name, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->testtask->desc;?></th>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index 373f966796..782e781c57 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -17,7 +17,7 @@
 <table class='table-1 colored tablesorter fixed'>
   <caption class='caption-tl'>
     <div class='f-left'><?php echo $lang->testtask->unlinkedCases;?></div>
-    <div class='f-right'>
+    <div class='text-right'>
       <?php
       $lang->testtask->linkCase = $lang->testtask->linkByStory;
       common::printIcon('testtask', 'linkCase', "taskID=$taskID&param=bystory");
@@ -69,7 +69,7 @@
       <?php if($cases):?>
       <div class='f-left'><?php echo html::selectAll() . html::selectReverse() . html::submitButton();?></div>
       <?php endif;?>
-      <div class='f-right'><?php $pager->show();?></div>
+      <div class='text-right'><?php $pager->show();?></div>
     </td>
   </tr>
   </tfoot>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 999c2111a7..12e5fca77c 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -20,7 +20,7 @@
 <table class='table-1'>
   <caption>
     <div class='f-left'>RESULT#<?php echo $result->id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " <span class='$result->caseResult'>" . $lang->testcase->resultList[$result->caseResult] . '</span>';?></div>
-    <?php if(isset($build)):?><div class='f-right'><?php echo $lang->testtask->build . $lang->colon . $build;?></div><?php endif;?>
+    <?php if(isset($build)):?><div class='text-right'><?php echo $lang->testtask->build . $lang->colon . $build;?></div><?php endif;?>
   </caption>
   <tr>
     <th class='w-30px'><?php echo $lang->testcase->stepID;?></th>
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 35edd699c9..6e3e1432b2 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -27,7 +27,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->todo->pri;?></th>
-      <td><?php echo html::select('pri', $lang->todo->priList, '', 'class=select-3');?></td>
+      <td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->todo->name;?></th>
@@ -42,7 +42,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->todo->status;?></th>
-      <td><?php echo html::select('status', $lang->todo->statusList, '', 'class=select-3');?></td>
+      <td><?php echo html::select('status', $lang->todo->statusList, '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->todo->beginAndEnd;?></th>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index 6375615d85..245a50d018 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -27,7 +27,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->todo->pri;?></th>
-      <td><?php echo html::select('pri', $lang->todo->priList, $todo->pri, 'class=select-3');?></td>
+      <td><?php echo html::select('pri', $lang->todo->priList, $todo->pri, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->todo->name;?></th>
@@ -45,7 +45,7 @@
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->todo->status;?></th>
-      <td><?php echo html::select('status', $lang->todo->statusList, $todo->status, 'class=select-3');?></td>
+      <td><?php echo html::select('status', $lang->todo->statusList, $todo->status, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->todo->beginAndEnd;?></th>
diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php
index 80ea66edbb..337849c6de 100644
--- a/module/tree/view/edit.html.php
+++ b/module/tree/view/edit.html.php
@@ -21,7 +21,7 @@
     </tr>
     <tr <?php if($hidden) echo "style='display:none'";?>>
       <th class='rowhead'><?php echo $lang->tree->name;?></th>
-      <td><?php echo html::input('name', $module->name, "class='text-1'");?></td>
+      <td><?php echo html::input('name', $module->name, "class='form-control'");?></td>
     </tr>
     <?php if($type == 'bug'):?>
     <tr>
diff --git a/module/user/control.php b/module/user/control.php
index 5ea8bebf76..82651ebf5b 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -912,8 +912,8 @@ class user extends control
     public function ajaxGetContactUsers($contactListID)
     {
         $users = $this->user->getPairs('nodeleted,devfirst');
-        if(!$contactListID) return print(html::select('mailto[]', $users, '', "class='text-1' multiple data-placeholder='{$this->lang->chooseUsersToMail}'"));
+        if(!$contactListID) return print(html::select('mailto[]', $users, '', "class='form-control' multiple data-placeholder='{$this->lang->chooseUsersToMail}'"));
         $list = $this->user->getContactListByID($contactListID);
-        return print(html::select('mailto[]', $users, $list->userList, "class='text-1' multiple data-placeholder='{$this->lang->chooseUsersToMail}'"));
+        return print(html::select('mailto[]', $users, $list->userList, "class='form-control' multiple data-placeholder='{$this->lang->chooseUsersToMail}'"));
     }
 }
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index a479a1c50b..1993ed0e46 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -35,7 +35,7 @@
       <td><?php echo $i+1;?></td>
       <td><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='select-1'");?>
       <td><?php echo html::input("account[$i]", '', "class='text-1 account_$i' autocomplete='off' onchange='changeEmail($i)'");?></td>
-      <td><?php echo html::input("realname[$i]", '', "class='text-1'");?></td>
+      <td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>
       <td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 0 ? 'ditto' : '', "class='select-1' onchange='changeGroup(this.value, $i)'");?></td>
       <td><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='select-1'");?></td>
       <td><?php echo html::input("email[$i]", '', "class='text-1 email_$i' onchange='setDefaultEmail($i)'");?></td>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index 46c05279f5..eec5269a87 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -32,11 +32,11 @@
     <tr class='text-center'>
       <td><?php echo $user->id;?></td>
       <td><?php echo html::select("dept[$user->id]", $depts, empty($user->dept) ? 'ditto' : $user->dept, "class='select-1'");?>
-      <td><?php echo html::input("account[$user->id]", $user->account, "class='text-1' autocomplete='off'");?></td>
-      <td><?php echo html::input("realname[$user->id]", $user->realname, "class='text-1'");?></td>
+      <td><?php echo html::input("account[$user->id]", $user->account, "class='form-control' autocomplete='off'");?></td>
+      <td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control'");?></td>
       <td><?php echo html::select("role[$user->id]", $lang->user->roleList, empty($user->role) ? 'ditto' : $user->role, "class='select-1'");?>
-      <td><?php echo html::input("commiter[$user->id]", $user->commiter, "class='text-1'");?></td>
-      <td><?php echo html::input("email[$user->id]", $user->email, "class='text-1'");?></td>
+      <td><?php echo html::input("commiter[$user->id]", $user->commiter, "class='form-control'");?></td>
+      <td><?php echo html::input("email[$user->id]", $user->email, "class='form-control'");?></td>
       <td><?php echo html::input("join[$user->id]", $user->join, "class='w-p70 date'");?></td>
     </tr>
     <?php endforeach;?>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index da6ecee8fd..aefb470e56 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -19,39 +19,39 @@
     <caption><?php echo $lang->user->create;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->user->dept;?></th>
-      <td><?php echo html::select('dept', $depts, $deptID, "class='select-3'");?>
+      <td><?php echo html::select('dept', $depts, $deptID, "class='form-control'");?>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->account;?></th>
-      <td><?php echo html::input('account', '', "class='text-3' autocomplete='off'");?></td>
+      <td><?php echo html::input('account', '', "class='form-control' autocomplete='off'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->realname;?></th>
-      <td><?php echo html::input('realname', '', "class='text-3'");?></td>
+      <td><?php echo html::input('realname', '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->password;?></th>
-      <td><?php echo html::password('password1', '', "class='text-3' autocomplete='off'");?></td>
+      <td><?php echo html::password('password1', '', "class='form-control' autocomplete='off'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->password2;?></th>
-      <td><?php echo html::password('password2', '', "class='text-3' autocomplete='off'");?></td>
+      <td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->role;?></th>
-      <td><?php echo html::select('role', $lang->user->roleList, '', "class='select-3' onchange='changeGroup(this.value)'");?></td>
+      <td><?php echo html::select('role', $lang->user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->group;?></th>
-      <td><?php echo html::select('group', $groupList, '', "class='select-3'");?></td>
+      <td><?php echo html::select('group', $groupList, '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->email;?></th>
-      <td><?php echo html::input('email', '', "class='text-3'");?></td>
+      <td><?php echo html::input('email', '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->commiter;?></th>
-      <td><?php echo html::input('commiter', '', "class='text-3'");?></td>
+      <td><?php echo html::input('commiter', '', "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->join;?></th>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index f00a7eca84..20fcfa3ab2 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -17,19 +17,19 @@
     <caption><?php echo $lang->user->edit;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->user->dept;?></th>
-      <td><?php echo html::select('dept', $depts, $user->dept, "class='select-3'");?>
+      <td><?php echo html::select('dept', $depts, $user->dept, "class='form-control'");?>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->account;?></th>
-      <td><?php echo html::input('account', $user->account, "class='text-3' autocomplete='off'");?></td>
+      <td><?php echo html::input('account', $user->account, "class='form-control' autocomplete='off'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->realname;?></th>
-      <td><?php echo html::input('realname', $user->realname, "class='text-3'");?></td>
+      <td><?php echo html::input('realname', $user->realname, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->role;?></th>
-      <td><?php echo html::select('role', $lang->user->roleList, $user->role, "class='select-3'");?></td>
+      <td><?php echo html::select('role', $lang->user->roleList, $user->role, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->group->priv;?></th>
@@ -37,11 +37,11 @@
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->user->commiter;?></th>
-      <td><?php echo html::input('commiter', $user->commiter, "class='text-3'");?></td>
+      <td><?php echo html::input('commiter', $user->commiter, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->email;?></th>
-      <td><?php echo html::input('email', $user->email, "class='text-3'");?></td>
+      <td><?php echo html::input('email', $user->email, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->join;?></th>
@@ -53,47 +53,47 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->password;?></th>
-      <td><?php echo html::password('password1', '', "class='text-3' autocomplete='off'");?></td>
+      <td><?php echo html::password('password1', '', "class='form-control' autocomplete='off'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->password2;?></th>
-      <td><?php echo html::password('password2', '', "class='text-3' autocomplete='off'");?></td>
+      <td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
     </tr>  
      <tr>
       <th class='rowhead'><?php echo $lang->user->skype;?></th>
-      <td><?php echo html::input('skype', $user->skype, "class='text-3'");?></td>
+      <td><?php echo html::input('skype', $user->skype, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->qq;?></th>
-      <td><?php echo html::input('qq', $user->qq, "class='text-3'");?></td>
+      <td><?php echo html::input('qq', $user->qq, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->yahoo;?></th>
-      <td><?php echo html::input('yahoo', $user->yahoo, "class='text-3'");?></td>
+      <td><?php echo html::input('yahoo', $user->yahoo, "class='form-control'");?></td>
     </tr>
      <tr>
       <th class='rowhead'><?php echo $lang->user->gtalk;?></th>
-      <td><?php echo html::input('gtalk', $user->gtalk, "class='text-3'");?></td>
+      <td><?php echo html::input('gtalk', $user->gtalk, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->wangwang;?></th>
-      <td><?php echo html::input('wangwang', $user->wangwang, "class='text-3'");?></td>
+      <td><?php echo html::input('wangwang', $user->wangwang, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->mobile;?></th>
-      <td><?php echo html::input('mobile', $user->mobile, "class='text-3'");?></td>
+      <td><?php echo html::input('mobile', $user->mobile, "class='form-control'");?></td>
     </tr>
      <tr>
       <th class='rowhead'><?php echo $lang->user->phone;?></th>
-      <td><?php echo html::input('phone', $user->phone, "class='text-3'");?></td>
+      <td><?php echo html::input('phone', $user->phone, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->address;?></th>
-      <td><?php echo html::input('address', $user->address, "class='text-3'");?></td>
+      <td><?php echo html::input('address', $user->address, "class='form-control'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->zipcode;?></th>
-      <td><?php echo html::input('zipcode', $user->zipcode, "class='text-3'");?></td>
+      <td><?php echo html::input('zipcode', $user->zipcode, "class='form-control'");?></td>
     </tr>
     <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
diff --git a/module/user/view/managecontacts.html.php b/module/user/view/managecontacts.html.php
index 6612e90a25..c01b0667e9 100644
--- a/module/user/view/managecontacts.html.php
+++ b/module/user/view/managecontacts.html.php
@@ -26,7 +26,7 @@
       <form method='post' target='hiddenwin' id='dataform' style='margin:0 0 0 10px; padding:0'>
       <div class='box-title' style='height:15px'>
         <div class='f-left'><?php echo $lang->user->contacts->manage;?></div>
-        <div class='f-right'><?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin');?></div>
+        <div class='text-right'><?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin');?></div>
       </div>
       <table class='table-1 fixed'> 
         <tr>
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index ef28731162..3a3084b6f4 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -16,7 +16,7 @@
 <table align='center' class='table-4'>
   <caption>
     <div class='f-left'> <?php echo $lang->user->profile;?></div>
-    <div class='f-right'><?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), $lang->user->editProfile); ?></div>
+    <div class='text-right'><?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), $lang->user->editProfile); ?></div>
   </caption>
   <tr>
     <th class='rowhead'><?php echo $lang->user->dept;?></th>
diff --git a/module/webapp/js/common.js b/module/webapp/js/common.js
index 7a3a419b79..04ab075465 100644
--- a/module/webapp/js/common.js
+++ b/module/webapp/js/common.js
@@ -26,7 +26,7 @@ function toggleShowapp(webappID, webappName)
         height = document.documentElement.clientHeight - 110;
         if(url[webappID] == undefined) url[webappID] = $('#useapp' + webappID).attr('href');
         $('#useapp' + webappID).attr('href', '#iframe' + webappID);
-        var html = "<tr id='iframe" + webappID + "'><td><p>" + webappName + "<span class='f-right'><button class='button-c' onclick='toggleShowapp(" + webappID + ", \" " + webappName + "\")'>" + packup + "</button></span></p><iframe src='" + url[webappID] + "' height='" + height + "' width='100%' style='border:1px solid #999;'></iframe></td></tr>";
+        var html = "<tr id='iframe" + webappID + "'><td><p>" + webappName + "<span class='text-right'><button class='button-c' onclick='toggleShowapp(" + webappID + ", \" " + webappName + "\")'>" + packup + "</button></span></p><iframe src='" + url[webappID] + "' height='" + height + "' width='100%' style='border:1px solid #999;'></iframe></td></tr>";
         $('#webapps').parent().parent().after(html);
         show[webappID] = true;
     }
diff --git a/module/webapp/view/create.html.php b/module/webapp/view/create.html.php
index 5dcfc72714..f617cee363 100644
--- a/module/webapp/view/create.html.php
+++ b/module/webapp/view/create.html.php
@@ -16,23 +16,23 @@
   <caption><?php echo $lang->webapp->create?></caption>
   <tr>
     <th align='left'><?php echo $lang->webapp->module?></th>
-    <td><?php echo html::select('module', $modules, '', "class='select-3'")?></td>
+    <td><?php echo html::select('module', $modules, '', "class='form-control'")?></td>
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->name?></th>
-    <td><?php echo html::input('name', '', "class='text-3'")?></td>
+    <td><?php echo html::input('name', '', "class='form-control'")?></td>
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->url?></th>
-    <td><?php echo html::input('url', '', "class='text-3'")?></td>
+    <td><?php echo html::input('url', '', "class='form-control'")?></td>
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->target?></th>
-    <td><?php echo html::select('target', $lang->webapp->targetList, '', "class='select-3'")?></td>
+    <td><?php echo html::select('target', $lang->webapp->targetList, '', "class='form-control'")?></td>
   </tr>
   <tr class="size hidden">
     <th align='left'><?php echo $lang->webapp->size?></th>
-    <td><?php echo html::select('size', $lang->webapp->sizeList, '', "class='select-3'")?></td>
+    <td><?php echo html::select('size', $lang->webapp->sizeList, '', "class='form-control'")?></td>
   </tr>
   <tr class="customSize hidden">
     <th align='left'><?php echo $lang->webapp->custom?></th>
@@ -40,7 +40,7 @@
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->abstract?></th>
-    <td><?php echo html::input('abstract', '', "class='text-3' maxlength='30'")?> <span><?php echo $lang->webapp->noticeAbstract?></span></td>
+    <td><?php echo html::input('abstract', '', "class='form-control' maxlength='30'")?> <span><?php echo $lang->webapp->noticeAbstract?></span></td>
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->desc?></th>
@@ -48,7 +48,7 @@
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->icon?></th>
-    <td><?php echo html::file('files', "class='text-1' size='57'")?><br /><span><?php echo $lang->webapp->noticeIcon?></span></td>
+    <td><?php echo html::file('files', "class='form-control' size='57'")?><br /><span><?php echo $lang->webapp->noticeIcon?></span></td>
   </tr>
   <tr><td colspan='2' align='center'><?php echo html::submitButton()?></td></tr>
 </table>
diff --git a/module/webapp/view/edit.html.php b/module/webapp/view/edit.html.php
index 6fc4a9626e..931c50ab0c 100644
--- a/module/webapp/view/edit.html.php
+++ b/module/webapp/view/edit.html.php
@@ -16,21 +16,21 @@
   <caption><?php echo $lang->webapp->edit?></caption>
   <tr>
     <th align='left'><?php echo $lang->webapp->module?></th>
-    <td><?php echo html::select('module', $modules, $webapp->module, "class='select-3'")?></td>
+    <td><?php echo html::select('module', $modules, $webapp->module, "class='form-control'")?></td>
   </tr>
   <?php if($webapp->addType != 'system'):?>
   <tr>
     <th align='left'><?php echo $lang->webapp->name?></th>
-    <td><?php echo html::input('name', $webapp->name, "class='text-3'")?></td>
+    <td><?php echo html::input('name', $webapp->name, "class='form-control'")?></td>
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->url?></th>
-    <td><?php echo html::input('url', $webapp->url, "class='text-3'")?></td>
+    <td><?php echo html::input('url', $webapp->url, "class='form-control'")?></td>
   </tr>
   <?php endif;?>
   <tr>
     <th align='left'><?php echo $lang->webapp->target?></th>
-    <td><?php echo html::select('target', $lang->webapp->targetList, $webapp->target, "class='select-3'")?></td>
+    <td><?php echo html::select('target', $lang->webapp->targetList, $webapp->target, "class='form-control'")?></td>
   </tr>
   <?php 
   $customWidth  = '';
@@ -44,7 +44,7 @@
   ?>
   <tr class="size">
     <th align='left'><?php echo $lang->webapp->size?></th>
-    <td><?php echo html::select('size', $lang->webapp->sizeList, $webapp->size, "class='select-3'")?></td>
+    <td><?php echo html::select('size', $lang->webapp->sizeList, $webapp->size, "class='form-control'")?></td>
   </tr>
   <tr class="customSize <?php if($webapp->size != 'custom') echo 'hidden'?>">
     <th align='left'><?php echo $lang->webapp->custom?></th>
@@ -52,7 +52,7 @@
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->abstract?></th>
-    <td><?php echo html::input('abstract', $webapp->abstract, "class='text-3' maxlength='30'")?> <span><?php echo $lang->webapp->noticeAbstract?></span></td>
+    <td><?php echo html::input('abstract', $webapp->abstract, "class='form-control' maxlength='30'")?> <span><?php echo $lang->webapp->noticeAbstract?></span></td>
   </tr>
   <tr>
     <th align='left'><?php echo $lang->webapp->desc?></th>
@@ -64,7 +64,7 @@
     <td>
       <?php
       if($webapp->icon) echo "<p><img src='{$webapp->icon->webPath}' /></p>";
-      echo html::file('files', "class='text-1' size='57'");
+      echo html::file('files', "class='form-control' size='57'");
       ?>
       <br /><span><?php echo $lang->webapp->noticeIcon?></span>
     </td>
@@ -77,11 +77,11 @@
 <table class='table-1'>
   <tr class="hideSize">
     <th><?php echo $lang->webapp->size?></th>
-    <td><?php echo html::select('size', $lang->webapp->sizeList, $webapp->size, "class='select-3'")?></td>
+    <td><?php echo html::select('size', $lang->webapp->sizeList, $webapp->size, "class='form-control'")?></td>
   </tr>
   <tr class="hideHeight">
     <th><?php echo $lang->webapp->height?></th>
-    <td><?php echo html::input('size', $webapp->size, "class='text-3'")?></td>
+    <td><?php echo html::input('size', $webapp->size, "class='form-control'")?></td>
   </tr>
 </table>
 </div>
diff --git a/module/webapp/view/obtain.html.php b/module/webapp/view/obtain.html.php
index 7d809c0fcf..ffd92f5da7 100644
--- a/module/webapp/view/obtain.html.php
+++ b/module/webapp/view/obtain.html.php
@@ -26,7 +26,7 @@
       <div class='box-title'><?php echo $lang->webapp->bySearch;?></div>
       <div class='box-content a-center'>
         <form method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
-        <?php echo html::input('key', $this->post->key, "class='text-1'") . html::submitButton($lang->webapp->bySearch);?>
+        <?php echo html::input('key', $this->post->key, "class='form-control'") . html::submitButton($lang->webapp->bySearch);?>
         </form>
       </div>
       <div class='box-title'><?php echo $lang->webapp->byCategory;?></div>
diff --git a/module/webapp/view/view.html.php b/module/webapp/view/view.html.php
index 49d28e2827..a1d8feb1c6 100644
--- a/module/webapp/view/view.html.php
+++ b/module/webapp/view/view.html.php
@@ -14,7 +14,7 @@
 <table class='table-1'>
   <caption>
     <?php echo $lang->webapp->view?>
-    <span class='f-right'><?php if($type =='local') common::printLink('webapp', 'edit', "webappID=$webapp->id", $lang->edit);?></span>
+    <span class='text-right'><?php if($type =='local') common::printLink('webapp', 'edit', "webappID=$webapp->id", $lang->edit);?></span>
   </caption>
   <?php if($type == 'local'):?>
   <tr>