diff --git a/adddomain.tpl b/adddomain.tpl
index 40b3db8..64d963c 100644
--- a/adddomain.tpl
+++ b/adddomain.tpl
@@ -44,7 +44,7 @@
                         <div class="row domains-row">
                             <div class="col-xs-9">
                                 <div class="input-group">
-                                    <span class="input-group-addon">{lang key='orderForm.www'}</span>
+                                    <label class="input-group-addon" for="inputDomain">{lang key='orderForm.www'}</label>
                                     <input type="text" name="sld" value="{$sld}" id="inputDomain" class="form-control" autocapitalize="none" />
                                 </div>
                             </div>
diff --git a/configuredomains.tpl b/configuredomains.tpl
index feec9e9..e282426 100644
--- a/configuredomains.tpl
+++ b/configuredomains.tpl
@@ -60,7 +60,7 @@
                         {if $domain.eppenabled}
                             <div class="col-sm-12">
                                 <div class="form-group prepend-icon">
-                                    <input type="text" name="epp[{$num}]" id="inputEppcode{$num}" value="{$domain.eppvalue}" class="field" placeholder="{$LANG.domaineppcode}" />
+                                    <input type="text" name="epp[{$num}]" id="inputEppcode{$num}" value="{$domain.eppvalue}" class="field" placeholder="{$LANG.domaineppcode}" title="{$LANG.domaineppcode}" />
                                     <label for="cardno" class="field-icon">
                                         <i class="fa fa-calendar"></i>
                                     </label>
diff --git a/configureproductdomain.tpl b/configureproductdomain.tpl
index e292314..55ce21d 100644
--- a/configureproductdomain.tpl
+++ b/configureproductdomain.tpl
@@ -23,7 +23,8 @@
             {include file="orderforms/standard_cart/sidebar-categories-collapsed.tpl"}
 
             <form id="frmProductDomain" onsubmit="checkdomain();return false">
-
+            <fieldset>
+            <legend>Which domain?</legend>
                 <div class="domain-selection-options">
                     {if $incartdomains}
                         <div class="option">
@@ -34,7 +35,7 @@
                                 <div class="row">
                                     <div class="col-sm-8 col-sm-offset-1 col-md-6 col-md-offset-2">
                                         <div class="domains-row">
-                                            <select id="incartsld" name="incartdomain" class="form-control">
+                                            <select id="incartsld" name="incartdomain" class="form-control" title="In Cart Domain">
                                                 {foreach key=num item=incartdomain from=$incartdomains}
                                                     <option value="{$incartdomain}">{$incartdomain}</option>
                                                 {/foreach}
@@ -61,12 +62,12 @@
                                         <div class="row domains-row">
                                             <div class="col-xs-9">
                                                 <div class="input-group">
-                                                    <span class="input-group-addon">{$LANG.orderForm.www}</span>
+                                                    <label class="input-group-addon" for="registersld">{$LANG.orderForm.www}</label>
                                                     <input type="text" id="registersld" value="{$sld}" class="form-control" autocapitalize="none" />
                                                 </div>
                                             </div>
                                             <div class="col-xs-3">
-                                                <select id="registertld" class="form-control">
+                                                <select id="registertld" class="form-control" title="TLD">
                                                     {foreach from=$registertlds item=listtld}
                                                         <option value="{$listtld}"{if $listtld eq $tld} selected="selected"{/if}>{$listtld}</option>
                                                     {/foreach}
@@ -94,12 +95,12 @@
                                         <div class="row domains-row">
                                             <div class="col-xs-9">
                                                 <div class="input-group">
-                                                    <span class="input-group-addon">www.</span>
+                                                    <label class="input-group-addon" for="transfersld">www.</label>
                                                     <input type="text" id="transfersld" value="{$sld}" class="form-control" autocapitalize="none" />
                                                 </div>
                                             </div>
                                             <div class="col-xs-3">
-                                                <select id="transfertld" class="form-control">
+                                                <select id="transfertld" class="form-control" title="TLD">
                                                     {foreach from=$transfertlds item=listtld}
                                                         <option value="{$listtld}"{if $listtld eq $tld} selected="selected"{/if}>{$listtld}</option>
                                                     {/foreach}
@@ -129,10 +130,10 @@
                                                 <p class="form-control-static">www.</p>
                                             </div>
                                             <div class="col-xs-7">
-                                                <input type="text" id="owndomainsld" value="{$sld}" placeholder="{$LANG.yourdomainplaceholder}" class="form-control" autocapitalize="none" />
+                                                <input type="text" id="owndomainsld" value="{$sld}" placeholder="{$LANG.yourdomainplaceholder}" title="your domain place holder" class="form-control" autocapitalize="none" />
                                             </div>
                                             <div class="col-xs-3">
-                                                <input type="text" id="owndomaintld" value="{$tld|substr:1}" placeholder="{$LANG.yourtldplaceholder}" class="form-control" autocapitalize="none" />
+                                                <input type="text" id="owndomaintld" value="{$tld|substr:1}" placeholder="{$LANG.yourtldplaceholder}" title="your tld place holder" class="form-control" autocapitalize="none" />
                                             </div>
                                         </div>
                                     </div>
@@ -180,6 +181,8 @@
                     {/if}
                 </div>
 
+                </fieldset>
+
                 {if $freedomaintlds}
                     <p>* <em>{$LANG.orderfreedomainregistration} {$LANG.orderfreedomainappliesto}: {$freedomaintlds}</em></p>
                 {/if}
diff --git a/domainrenewals.tpl b/domainrenewals.tpl
index 8ba070d..5909d15 100644
--- a/domainrenewals.tpl
+++ b/domainrenewals.tpl
@@ -41,7 +41,7 @@
                             <tr>
                                 <td>
                                     {if !$renewal.pastgraceperiod && !$renewal.beforerenewlimit}
-                                        <input type="checkbox" name="renewalids[]" value="{$renewal.id}" />
+                                        <input type="checkbox" name="renewalids[]" title="renewalids[]" value="{$renewal.id}" />
                                     {/if}
                                 </td>
                                 <td>
diff --git a/sidebar-categories-collapsed.tpl b/sidebar-categories-collapsed.tpl
index 6d05c6c..dd52801 100644
--- a/sidebar-categories-collapsed.tpl
+++ b/sidebar-categories-collapsed.tpl
@@ -3,12 +3,12 @@
     <div class="pull-left form-inline">
         <form method="get" action="{$smarty.server.PHP_SELF}">
             <select name="gid" onchange="submit()" class="form-control">
-                <optgroup label="Product Categories">
+                <optgroup title="Product Categories">
                     {foreach key=num item=productgroup from=$productgroups}
                         <option value="{$productgroup.gid}"{if $gid eq $productgroup.gid} selected="selected"{/if}>{$productgroup.name}</option>
                     {/foreach}
                 </optgroup>
-                <optgroup label="Actions">
+                <optgroup title="Actions">
                     {if $loggedin}
                         <option value="addons"{if $gid eq "addons"} selected{/if}>{$LANG.cartproductaddons}</option>
                         {if $renewalsenabled}
@@ -30,7 +30,7 @@
     {if !$loggedin && $currencies}
         <div class="pull-right form-inline">
             <form method="post" action="cart.php{if $action}?a={$action}{elseif $gid}?gid={$gid}{/if}">
-                <select name="currency" onchange="submit()" class="form-control">
+                <select name="currency" onchange="submit()" class="form-control" title="choose currency">
                     <option value="">{$LANG.choosecurrency}</option>
                     {foreach from=$currencies item=curr}
                         <option value="{$curr.id}">{$curr.code}</option>
diff --git a/viewcart.tpl b/viewcart.tpl
index d7b1908..691b607 100644
--- a/viewcart.tpl
+++ b/viewcart.tpl
@@ -124,7 +124,7 @@
                                             {if $showqtyoptions}
                                                 <div class="col-sm-2 item-qty">
                                                     {if $product.allowqty}
-                                                        <input type="number" name="qty[{$num}]" value="{$product.qty}" class="form-control text-center" />
+                                                        <input type="number" title="qty[{$num}]" name="qty[{$num}]" value="{$product.qty}" class="form-control text-center" />
                                                         <button type="submit" class="btn btn-xs">
                                                             {$LANG.orderForm.update}
                                                         </button>