diff --git a/configuressl-stepone.tpl b/configuressl-stepone.tpl
index 45debba6..5997e9f7 100644
--- a/configuressl-stepone.tpl
+++ b/configuressl-stepone.tpl
@@ -65,21 +65,21 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputLastName">{$LANG.clientarealastname}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="lastname" id="inputLastName" value="{$lastname}" />
+                        <input type="text" class="form-control" name="lastname" id="inputLastName" value="{$lastname}" />
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputOrgName">{$LANG.organizationname}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="orgname" id="inputOrgName" value="{$orgname}" />
+                        <input type="text" class="form-control" name="orgname" id="inputOrgName" value="{$orgname}" />
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputJobTitle">{$LANG.jobtitle}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="jobtitle" id="inputJobTitle" value="{$jobtitle}" />
+                        <input type="text" class="form-control" name="jobtitle" id="inputJobTitle" value="{$jobtitle}" />
                         <p class="help-block">{$LANG.jobtitlereqforcompany}</p>
                     </div>
                 </div>
@@ -87,42 +87,42 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputEmail">{$LANG.clientareaemail}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="email" id="inputEmail" value="{$email}" />
+                        <input type="text" class="form-control" name="email" id="inputEmail" value="{$email}" />
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputAddress1">{$LANG.clientareaaddress1}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="address1" id="inputAddress1" value="{$address1}" />
+                        <input type="text" class="form-control" name="address1" id="inputAddress1" value="{$address1}" />
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputAddress2">{$LANG.clientareaaddress2}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="address2" id="inputAddress2" value="{$address2}" />
+                        <input type="text" class="form-control" name="address2" id="inputAddress2" value="{$address2}" />
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputCity">{$LANG.clientareacity}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="city" id="inputCity" value="{$city}" />
+                        <input type="text" class="form-control" name="city" id="inputCity" value="{$city}" />
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputState">{$LANG.clientareastate}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="state" id="inputState" value="{$state}" />
+                        <input type="text" class="form-control" name="state" id="inputState" value="{$state}" />
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="inputPostcode">{$LANG.clientareapostcode}</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control"name="postcode" id="inputPostcode" value="{$postcode}" />
+                        <input type="text" class="form-control" name="postcode" id="inputPostcode" value="{$postcode}" />
                     </div>
                 </div>
 
diff --git a/css/overrides.css b/css/overrides.css
index 0c223979..baaa7d58 100644
--- a/css/overrides.css
+++ b/css/overrides.css
@@ -7,7 +7,7 @@
  * @cssdoc    version 1.0-pre
  * @package   WHMCS
  * @author    WHMCS Limited <development@whmcs.com>
- * @copyright Copyright (c) WHMCS Limited 2005-2014
+ * @copyright Copyright (c) WHMCS Limited 2005-2015
  * @license   http://www.whmcs.com/license/
  * @link      http://www.whmcs.com/
 */
diff --git a/css/quote.css b/css/quote.css
index 319d0bc6..5698ec47 100644
--- a/css/quote.css
+++ b/css/quote.css
@@ -7,7 +7,7 @@
  * @cssdoc    version 1.0-pre
  * @package   WHMCS
  * @author    WHMCS Limited <development@whmcs.com>
- * @copyright Copyright (c) WHMCS Limited 2005-2014
+ * @copyright Copyright (c) WHMCS Limited 2005-2015
  * @license   http://www.whmcs.com/license/
  * @link      http://www.whmcs.com/
 */
diff --git a/css/styles.css b/css/styles.css
index ae3cc055..bc940f74 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -631,7 +631,7 @@ div.tweet span {
 
 /* ===== Domain Checker ===== */
 
-div.domainresults div {
+div.domainresults div:not(.btn-group) {
     margin: 0;
     padding: 10px 25px;
     background-color: #ddd;
@@ -640,7 +640,7 @@ div.domainresults div {
     border-radius: 6px 6px 0 0;
 }
 
-div.domainresults div span {
+div.domainresults div:not(.btn-group) span {
     padding-left: 20px;
     font-size: 14px;
     color: #888;
diff --git a/domainchecker-results.tpl b/domainchecker-results.tpl
index 5808cbc3..1ae6aae5 100644
--- a/domainchecker-results.tpl
+++ b/domainchecker-results.tpl
@@ -35,10 +35,38 @@
                                 {$searchResults.shortestPeriod.register}
                             </td>
                             <td class="text-center">
-                                <button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-primary btn-sm">
-                                    <span class="glyphicon glyphicon-shopping-cart"></span>
-                                    {$LANG.addtocart}
-                                </button>
+                                {if count($searchResults.pricing) == 1}
+                                    <button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-primary btn-sm">
+                                        <span class="glyphicon glyphicon-shopping-cart"></span>
+                                        {$LANG.addtocart}
+                                    </button>
+                                {else}
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-primary btn-sm" onclick="addToCart(this, false, 'register')">
+                                            <b class="glyphicon glyphicon-shopping-cart"></b>
+                                            {$LANG.addtocart}
+                                        </button>
+                                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle additional-options" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <b class="caret"></b>
+                                            <span class="sr-only">
+                                                {lang key="domainChecker.additionalPricingOptions" domain=$searchResults.domainName}
+                                            </span>
+                                        </button>
+                                        <ul class="dropdown-menu" role="menu">
+                                            {foreach $searchResults.pricing as $years => $price}
+                                                {if $price@iteration eq 1}
+                                                    {* Don't output the first as this is default *}
+                                                    {continue}
+                                                {/if}
+                                                <li>
+                                                    <a onclick="addToCart(this, false, 'register', {$years});return false;">
+                                                        {$years} {$LANG.orderyears} @ {$price.register}
+                                                    </a>
+                                                </li>
+                                            {/foreach}
+                                        </ul>
+                                    </div>
+                                {/if}
                             </td>
                         </tr>
                     {/if}
@@ -71,12 +99,40 @@
                                     {$result.shortestPeriod.transfer}
                                 {/if}
                             </td>
-                            <td class="text-center">
+                            <td class="text-right">
                                 {if ($searchingFor == 'register' && $result.isAvailable)}
-                                    <button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-primary btn-sm">
-                                        <span class="glyphicon glyphicon-shopping-cart"></span>
-                                        {$LANG.addtocart}
-                                    </button>
+                                    {if count($result.pricing) == 1}
+                                        <button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-primary btn-sm">
+                                            <span class="glyphicon glyphicon-shopping-cart"></span>
+                                            {$LANG.addtocart}
+                                        </button>
+                                    {else}
+                                        <div class="btn-group">
+                                            <button type="button" class="btn btn-primary btn-sm" onclick="addToCart(this, false, 'register')">
+                                                <b class="glyphicon glyphicon-shopping-cart"></b>
+                                                {$LANG.addtocart}
+                                            </button>
+                                            <button type="button" class="btn btn-primary btn-sm dropdown-toggle additional-options" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                <b class="caret"></b>
+                                            <span class="sr-only">
+                                                {lang key="domainChecker.additionalPricingOptions" domain=$result.domainName}
+                                            </span>
+                                            </button>
+                                            <ul class="dropdown-menu" role="menu">
+                                                {foreach $result.pricing as $years => $price}
+                                                    {if $price@iteration eq 1}
+                                                        {* Don't output the first as this is default *}
+                                                        {continue}
+                                                    {/if}
+                                                    <li>
+                                                        <a onclick="addToCart(this, false, 'register', {$years});return false;">
+                                                            {$years} {$LANG.orderyears} @ {$price.register}
+                                                        </a>
+                                                    </li>
+                                                {/foreach}
+                                            </ul>
+                                        </div>
+                                    {/if}
                                 {elseif ($searchingFor == 'transfer' && $result.isRegistered)}
                                     <button type="button" onclick="addToCart(this, false, 'transfer')" class="btn btn-primary btn-sm">
                                         <span class="glyphicon glyphicon-shopping-cart"></span>
@@ -111,11 +167,39 @@
                                 <td class="text-center">
                                     {$result.shortestPeriod.register}
                                 </td>
-                                <td class="text-center">
-                                    <button type="button" class="btn btn-default btn-sm" onclick="addToCart(this, true, 'register')">
-                                        <span class="glyphicon glyphicon-shopping-cart"></span>
-                                        {$LANG.addtocart}
-                                    </button>
+                                <td class="text-right">
+                                    {if count($result.pricing) == 1}
+                                        <button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-default btn-sm">
+                                            <span class="glyphicon glyphicon-shopping-cart"></span>
+                                            {$LANG.addtocart}
+                                        </button>
+                                    {else}
+                                        <div class="btn-group">
+                                            <button type="button" class="btn btn-default btn-sm" onclick="addToCart(this, false, 'register')">
+                                                <b class="glyphicon glyphicon-shopping-cart"></b>
+                                                {$LANG.addtocart}
+                                            </button>
+                                            <button type="button" class="btn btn-default btn-sm dropdown-toggle additional-options" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                <b class="caret"></b>
+                                            <span class="sr-only">
+                                                {lang key="domainChecker.additionalPricingOptions" domain=$result.domainName}
+                                            </span>
+                                            </button>
+                                            <ul class="dropdown-menu" role="menu">
+                                                {foreach $result.pricing as $years => $price}
+                                                    {if $price@iteration eq 1}
+                                                        {* Don't output the first as this is default *}
+                                                        {continue}
+                                                    {/if}
+                                                    <li>
+                                                        <a onclick="addToCart(this, false, 'register', {$years});return false;">
+                                                            {$years} {$LANG.orderyears} @ {$price.register}
+                                                        </a>
+                                                    </li>
+                                                {/foreach}
+                                            </ul>
+                                        </div>
+                                    {/if}
                                 </td>
                             </tr>
                         {/foreach}
diff --git a/header.tpl b/header.tpl
index fad12de4..9ac7ce6f 100644
--- a/header.tpl
+++ b/header.tpl
@@ -49,7 +49,7 @@
                 <div class="pull-right nav">
                     <a href="#" class="quick-nav" data-toggle="popover" id="loginOrRegister" data-placement="bottom"><i class="fa fa-user"></i> {$LANG.login}</a>
                     <div id="loginOrRegisterContent" class="hidden">
-                        <form action="dologin.php" method="post" role="form">
+                        <form action="{$systemsslurl}dologin.php" method="post" role="form">
                             <div class="form-group">
                                 <input type="email" name="username" class="form-control" placeholder="{$LANG.clientareaemail}" required />
                             </div>
@@ -228,6 +228,6 @@
         {/if}
         <!-- Container for main page display content -->
         <div class="{if $primarySidebar->hasChildren() || $secondarySidebar->hasChildren()}col-md-9 pull-md-right{else}col-xs-12{/if} main-content">
-            {if !$primarySidebar->hasChildren() && !$showingLoginPage && $templatefile != 'homepage'}
+            {if !$primarySidebar->hasChildren() && !$showingLoginPage && !$inShoppingCart && $templatefile != 'homepage'}
                 {include file="$template/includes/pageheader.tpl" title=$displayTitle desc=$tagline showbreadcrumb=true}
             {/if}
diff --git a/js/domainchecker.js b/js/domainchecker.js
index 12bec227..3e58b806 100644
--- a/js/domainchecker.js
+++ b/js/domainchecker.js
@@ -109,18 +109,30 @@ jQuery(document).ready(function() {
     });
 });
 
-function addToCart(clickedBtn, performAvailabilityCheck, orderType) {
+function addToCart(clickedBtn, performAvailabilityCheck, orderType, years) {
 
     var selectedDomain = jQuery(clickedBtn).closest('tr')
         .find('td:first strong')
         .html();
+    var appendYears = '';
+    if (typeof years != "undefined") {
+        clickedBtn = jQuery(clickedBtn).closest('div')
+            .find('button:first');
+        appendYears = '&reg_period=' + years;
+    }
+
+    var cartDropDown = jQuery(clickedBtn).closest('div')
+        .find('button.additional-options');
+    if (typeof cartDropDown != "undefined") {
+        jQuery(cartDropDown).attr('disabled', 'disabled');
+    }
 
     jQuery(clickedBtn).attr('disabled', 'disabled')
         .html('<span class="glyphicon glyphicon-shopping-cart"></span> ' + langAdding + '...');
 
     jQuery.post(
         "domainchecker.php",
-        "addtocart=1&check=" + performAvailabilityCheck + "&token=" + csrfToken + "&domain=" + selectedDomain + "&orderType=" + orderType,
+        "addtocart=1&check=" + performAvailabilityCheck + "&token=" + csrfToken + "&domain=" + selectedDomain + "&orderType=" + orderType + appendYears,
         function(data) {
             if (data == 1) {
                 jQuery("#cartItemCount").html(((jQuery("#cartItemCount").html() * 1) + 1));
diff --git a/pwreset.tpl b/pwreset.tpl
index 2ab0a14d..ccce9e05 100644
--- a/pwreset.tpl
+++ b/pwreset.tpl
@@ -2,57 +2,61 @@
 
     {include file="$template/includes/pageheader.tpl" title=$LANG.pwreset}
 
-    {if $success}
+    {if $loggedin}
+        {include file="$template/includes/alert.tpl" type="error" msg=$LANG.noPasswordResetWhenLoggedIn textcenter=true}
+    {else}
+        {if $success}
 
-        {include file="$template/includes/alert.tpl" type="success" msg=$LANG.pwresetvalidationsent textcenter=true}
+            {include file="$template/includes/alert.tpl" type="success" msg=$LANG.pwresetvalidationsent textcenter=true}
 
-        <p>{$LANG.pwresetvalidationcheckemail}</p>
+            <p>{$LANG.pwresetvalidationcheckemail}</p>
 
-    {else}
+        {else}
 
-        {if $errormessage}
-            {include file="$template/includes/alert.tpl" type="error" msg=$errormessage textcenter=true}
-        {/if}
+            {if $errormessage}
+                {include file="$template/includes/alert.tpl" type="error" msg=$errormessage textcenter=true}
+            {/if}
 
-        {if $securityquestion}
+            {if $securityquestion}
 
-            <p>{$LANG.pwresetsecurityquestionrequired}</p>
+                <p>{$LANG.pwresetsecurityquestionrequired}</p>
 
-            <form method="post" action="pwreset.php"  class="form-stacked">
-                <input type="hidden" name="action" value="reset" />
-                <input type="hidden" name="email" value="{$email}" />
+                <form method="post" action="pwreset.php"  class="form-stacked">
+                    <input type="hidden" name="action" value="reset" />
+                    <input type="hidden" name="email" value="{$email}" />
 
-                <div class="form-group">
-                    <label for="inputAnswer">{$securityquestion}</label>
-                    <input type="text" name="answer" class="form-control" id="inputAnswer" autofocus>
-                </div>
+                    <div class="form-group">
+                        <label for="inputAnswer">{$securityquestion}</label>
+                        <input type="text" name="answer" class="form-control" id="inputAnswer" autofocus>
+                    </div>
 
-                <div class="form-group text-center">
-                    <button type="submit" class="btn btn-primary">{$LANG.pwresetsubmit}</button>
-                </div>
+                    <div class="form-group text-center">
+                        <button type="submit" class="btn btn-primary">{$LANG.pwresetsubmit}</button>
+                    </div>
 
-            </form>
+                </form>
 
-        {else}
+            {else}
 
-            <p>{$LANG.pwresetemailneeded}</p>
+                <p>{$LANG.pwresetemailneeded}</p>
 
-            <form method="post" action="{$systemsslurl}pwreset.php" role="form">
-                <input type="hidden" name="action" value="reset" />
+                <form method="post" action="{$systemsslurl}pwreset.php" role="form">
+                    <input type="hidden" name="action" value="reset" />
 
-                <div class="form-group">
-                    <label for="inputEmail">{$LANG.loginemail}</label>
-                    <input type="email" name="email" class="form-control" id="inputEmail" placeholder="{$LANG.enteremail}" autofocus>
-                </div>
+                    <div class="form-group">
+                        <label for="inputEmail">{$LANG.loginemail}</label>
+                        <input type="email" name="email" class="form-control" id="inputEmail" placeholder="{$LANG.enteremail}" autofocus>
+                    </div>
 
-                <div class="form-group text-center">
-                    <button type="submit" class="btn btn-primary">{$LANG.pwresetsubmit}</button>
-                </div>
+                    <div class="form-group text-center">
+                        <button type="submit" class="btn btn-primary">{$LANG.pwresetsubmit}</button>
+                    </div>
 
-            </form>
+                </form>
 
-        {/if}
+            {/if}
 
+        {/if}
     {/if}
 
 </div>
diff --git a/serverstatus.tpl b/serverstatus.tpl
index fd487d8b..1c750cac 100644
--- a/serverstatus.tpl
+++ b/serverstatus.tpl
@@ -5,7 +5,7 @@
             {$issue.title} ({$issue.status})
         </div>
         <ul class="list-group">
-            <li class="list-group-item {if $issue.priority == 'Critical'}list-group-item-danger{elseif $issue.priority == 'High'}list-group-item-warning{else}list-group-item-info{/if}"><strong>{$LANG.networkissuespriority}</strong> - {$issue.priority}</li>
+            <li class="list-group-item {if $issue.rawPriority == 'Critical'}list-group-item-danger{elseif $issue.rawPriority == 'High'}list-group-item-warning{elseif $issue.rawPriority == 'Low'}list-group-item-success{else}list-group-item-info{/if}"><strong>{$LANG.networkissuespriority}</strong> - {$issue.priority}</li>
             {if $issue.server or $issue.affecting}<li class="list-group-item"><strong>{$LANG.networkissuesaffecting} {$issue.type}</strong> - {if $issue.type eq $LANG.networkissuestypeserver}{$issue.server}{else}{$issue.affecting}{/if}</li>{/if}
             <li class="list-group-item">
                 <p>
diff --git a/viewticket.tpl b/viewticket.tpl
index bf71df64..ce438f79 100644
--- a/viewticket.tpl
+++ b/viewticket.tpl
@@ -76,6 +76,29 @@
 
         </div>
     </div>
+    <div class="panel panel-info visible-print-block">
+        <div class="panel-heading">
+            <h3 class="panel-title">
+                {$LANG.ticketinfo}
+            </h3>
+        </div>
+        <div class="panel-body container-fluid">
+            <div class="row">
+                <div class="col-md-2 col-xs-6">
+                    <b>{$LANG.supportticketsticketid}</b><br />{$tid}
+                </div>
+                <div class="col-md-4 col-xs-6">
+                    <b>{$LANG.supportticketsticketsubject}</b><br />{$subject}
+                </div>
+                <div class="col-md-2 col-xs-6">
+                    <b>{$LANG.supportticketspriority}</b><br />{$urgency}
+                </div>
+                <div class="col-md-4 col-xs-6">
+                    <b>{$LANG.supportticketsdepartment}</b><br />{$department}
+                </div>
+            </div>
+        </div>
+    </div>
 
     {foreach from=$descreplies key=num item=reply}
         <div class="ticket-reply{if $reply.admin} staff{/if}">