diff --git a/assets/dsroot/css/default-styles.css b/assets/dsroot/css/default-styles.css
index 568ae80..7fe0032 100644
--- a/assets/dsroot/css/default-styles.css
+++ b/assets/dsroot/css/default-styles.css
@@ -1,57 +1,60 @@
 /*  Copyright (c) 2014, SWITCH  */
 h1 {
-	font-family:Verdana, sans-serif;
-	font-size: 13px;
-	padding-bottom: 6px;
-	text-align: left;
+        font-family:Verdana, sans-serif;
+        font-size: 13px;
+        padding-bottom: 6px;
+        text-align: left;
 }
 
 p {
-	font-family:Verdana, sans-serif;
-	font-size: 12px;
-	text-align: left;
+        font-family:Verdana, sans-serif;
+        font-size: 12px;
+        text-align: left;
 }
 
 a {
-	color: #00247D;
-	text-decoration: underline;
+        color: #00247D;
+        text-decoration: underline;
 }
 
 a:visited {
-	color: #00247D;
-	text-decoration: underline;
+        color: #00247D;
+        text-decoration: underline;
 }
 
 a:focus, a:hover, a:active {
-	color: #F39800;
-	text-decoration: underline;
+        color: #F39800;
+        text-decoration: underline;
 }
 
 pre {
-	text-align: left;
+        text-align: left;
 }
 
 
 .promptMessage {
-	margin-top: 0;
+        margin-top: 0;
+        font-family:Verdana, sans-serif;
+        font-size: 12px;
+        color: #696969;
 }
 
 .selectOptions {
-	margin-bottom: 0;
+        margin-bottom: 0;
 }
 
 .box
 {
-	width: 720px;
-	text-align: center;
-	background-color: #FFFFFF;
-	box-shadow: 1px 1px 8px #999999;
-	border-radius: 13px;
-	-webkit-box-shadow: 1px 1px 8px #999999;
-	-webkit-border-radius: 13px;
-	-moz-box-shadow: 1px 1px 8px #999999;
-	-moz-border-radius: 13px;
-	padding: 10px 24px 10px 24px;
+        width: 920px;
+        text-align: center;
+        background-color: #FFFFFF;
+        box-shadow: 1px 1px 8px #999999;
+        border-radius: 13px;
+        -webkit-box-shadow: 1px 1px 8px #999999;
+        -webkit-border-radius: 13px;
+        -moz-box-shadow: 1px 1px 8px #999999;
+        -moz-border-radius: 13px;
+        padding: 10px 24px 10px 24px;
 }
 
 
@@ -64,124 +67,131 @@ pre {
 
 /* IE 8 hack */
 @media \0screen {
-	.box { border: 2px #969696 solid; }
+        .box { border: 2px #969696 solid; }
 }
 
 .menu {
-	width: 100%;
-	padding-left: 2px;
-	margin-top: 10px;
-	margin-left: 0;
-	float: left;
-	background: url("{$imageURL}/dual_line.png") repeat-x scroll 0 100% transparent;
-	font-family: Verdana, sans-serif;
-	font-size: 12px;
-	line-height: 45px;
+        width: 100%;
+        padding-left: 2px;
+        margin-top: 10px;
+        margin-left: 0;
+        float: left;
+        background: url("{$imageURL}/dual_line.png") repeat-x scroll 0 100% transparent;
+        font-family: Verdana, sans-serif;
+        font-size: 12px;
+        line-height: 45px;
 }
 
 .menu li {
-	float: left;
-	list-style:none;
-	line-height:35px;
-	margin-right:10px;
+        float: left;
+        list-style:none;
+        line-height:35px;
+        margin-right:10px;
 }
 
 .menu li.last {
-	background: url("{$imageURL}/separator.png") no-repeat scroll left center transparent;
-	padding-left: 8px;
-	float: left;
-	list-style:none;
+        background: url("{$imageURL}/separator.png") no-repeat scroll left center transparent;
+        padding-left: 8px;
+        float: left;
+        list-style:none;
 }
 
 .serviceName {
-	font-weight: bold;
+        font-weight: bold;
 }
 
 .hostName {
-	font-weight: bold;
+        font-weight: bold;
 }
 
 
 #container, .container {
-	position: absolute;
-	left: 50%;
-	top: 50%;
-	margin-left: -370px; 
-	margin-top: -200px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        margin-left: -470px; 
+        margin-top: -200px;
 }
 
 #content, .content {
-	width: 98%;
+        width: 98%;
+        font-family:Verdana, sans-serif;
+        font-size: 18px;
+        color: #696969;
+        text-align: left;
 }
 
 #header {
-	width: 100%;
-	display: inline-block;
-	text-align: left;
+        width: 100%;
+        display: inline-block;
+        text-align: left;
+        font-family: Verdana, sans-serif;
+        font-size: 30px;
 }
 
 #federationLogo {
-	border: 0;
-	float: left;
+        border: 0;
+        float: left;
 }
 
 #organisationLogo
 {
-	border: 0;
-	float: right;
+        border: 0;
+        float: right;
 }
 
 #userInputArea, .userInputArea {
-	width: 100%;
-	margin-left: auto;
-	margin-right: auto;
-	background-color: #F0F0F0;
-	border-color: #969696;
-	border-width: 1px;
-	border-style: solid;
-	padding: 6px;
+        width: 100%;
+        margin-left: auto;
+        margin-right: auto;
+        background-color: #F0F0F0;
+        border-color: #969696;
+        border-width: 1px;
+        border-style: solid;
+        padding: 6px;
 }
 
 #userIdPSelection, .userIdPSelection {
-	width: 480px;
-	font-size: 12px;
+        width: 480px;
+        font-size: 12px;
 }
 
 /* Device specific styles */
 @media only screen and (max-device-width: 720px){
-	.box {
-		width: auto;
-		box-shadow: none;
-		border-radius: 0;  
-		-webkit-box-shadow: none;
-		-webkit-border-radius: 0;
-		-moz-box-shadow: none;
-		-moz-border-radius: 0;
-		padding: 0;
-	}
-	
-	#content, .content {
-		width: 96%;
-	}
-	
-	#container, .container {
-		width: 96%;
-		position: auto;
-		left: auto;
-		top: auto;
-		margin-left: 0; 
-		margin-top: 0;
-	}
-	
-	#userIdPSelection, .userIdPSelection {
-		width: 60%;
-	}
-	
-	#userIdPSelection_iddwrap input {
-		width:90%!important;
-	}
+        .box {
+                width: auto;
+                box-shadow: none;
+                border-radius: 0;  
+                -webkit-box-shadow: none;
+                -webkit-border-radius: 0;
+                -moz-box-shadow: none;
+                -moz-border-radius: 0;
+                padding: 0;
+        }
+
+        #content, .content {
+                width: 96%;
+        }
+
+        #container, .container {
+                width: 96%;
+                position: auto;
+                left: auto;
+                top: auto;
+                margin-left: 0; 
+                margin-top: 0;
+        }
+
+        #userIdPSelection, .userIdPSelection {
+                width: 60%;
+        }
+
+        #userIdPSelection_iddwrap input {
+                width:90%!important;
+        }
 }
 
 html, body, form, fieldset, p, div, h1, h2, h3, h4, h5, h6 {
     -webkit-text-size-adjust:none;
 }
+
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index b24cb60..a34374d 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -2,33 +2,35 @@
 // CAF 2016 ?>
 
 <!-- Identity Provider Selection: Start -->
-<h1><?php echo getLocalString('header'); ?></h1> 
+<br /><?php echo getLocalString('header'); ?> <br /><br />
 <form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
-	<div id="userInputArea">
-		<p class="promptMessage"><?php echo $promptMessage ?></p>
-		<div style="text-align: center">
-			<select name="user_idp" id="userIdPSelection"> 
-				<option value="-" <?php echo $defaultSelected ?>><?php echo getLocalString('select_idp') ?> ...</option>
-			<?php printDropDownList($IDProviders, $selectedIDP) ?>
-			</select>
-			<input type="submit" style="background-color:#26A69A;color:white;" name="Select" accesskey="s" value="<?php echo getLocalString('select_button') ?>"> 
-		</div>
-		<div  style="text-align: left">
-			<p class="selectOptions">
-				<input type="checkbox" <?php echo $rememberSelectionChecked ?> name="session" id="rememberForSession" value="true">
-				<label for="rememberForSession"><?php echo getLocalString('remember_selection') ?></label><br>
-				<?php if ($showPermanentSetting) : ?>
-				<!-- Value permanent must be a number which is equivalent to the days the cookie should be valid -->
-				<input type="checkbox" name="permanent" id="rememberPermanent" value="100">
-				<label for="rememberPermanent"><?php echo getLocalString('permanently_remember_selection') ?></label>
-				<br />
-				<a href="https://www.internet2.edu/about-us/contact-us/" target="_blank">Help</a>
-				<?php endif ?>
-			</p>
-		</div>
-	</div>
+        <div id="userInputArea">
+                <p class="promptMessage"><?php echo $promptMessage ?></p>
+                <div style="text-align: center">
+                        <select name="user_idp" id="userIdPSelection" style="width:600px">
+                                <option value="-" <?php echo $defaultSelected ?>><?php echo getLocalString('select_idp') ?> ...</option>
+                        <?php printDropDownList($IDProviders, $selectedIDP) ?>
+                        </select>
+                        <input type="submit" style="background-color:#26A69A;color:white;width:15em;height:3em;" name="Select" accesskey="s" value="<?php echo getLocalString('select_button') ?>"> 
+                </div>
+                <div  style="text-align: left">
+                        <p class="selectOptions">
+                                <input type="checkbox" <?php echo $rememberSelectionChecked ?> name="session" id="rememberForSession" value="true">
+                                <label for="rememberForSession"><?php echo getLocalString('remember_selection') ?></label><br>
+                                <?php if ($showPermanentSetting) : ?>
+                                <!-- Value permanent must be a number which is equivalent to the days the cookie should be valid -->
+                                <input type="checkbox" name="permanent" id="rememberPermanent" value="100">
+                                <label for="rememberPermanent"><?php echo getLocalString('permanently_remember_selection') ?></label>
+                                <div  style="text-align: right">
+                                  <a href="https://www.internet2.edu/about-us/contact-us/" target="_blank">Help</a>
+                                </div>
+                                <?php endif ?>
+                        </p>
+                </div>
+        </div>
 </form>
 
 <!-- no message -->
 
 <!-- Identity Provider Selection: End -->
+
diff --git a/assets/dsroot/custom-header.php b/assets/dsroot/custom-header.php
index 561b516..a58630e 100644
--- a/assets/dsroot/custom-header.php
+++ b/assets/dsroot/custom-header.php
@@ -3,96 +3,97 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-	<title><?php echo getLocalString('title') ?></title> 
-	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-	<meta name="keywords" content="Home Organization, Discovery Service, WAYF, Shibboleth, Login, AAI">
-	<meta name="description" content="Choose your home organization to authenticate">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-	<link rel="stylesheet" href="<?php echo $_SERVER['SCRIPT_NAME'] ?>/styles.css" type="text/css">
-	<link rel="stylesheet" href="<?php echo $_SERVER['SCRIPT_NAME'] ?>/ImprovedDropDown.css" type="text/css">
-	<script type="text/javascript" src="<?php echo $javascriptURL ?>/jquery.js"></script>
-	<script type="text/javascript" src="<?php echo $javascriptURL ?>/improvedDropDown.js"></script>
-	<script type="text/javascript">
-	<!--
-	
-	// Prevent that WAYF is loaded in an IFRAME
-	function preventIframeEmbedding(){
-		if (top != self) {
-			top.location = self.location;
-		}
-	}
-	
-	// Set focus to submit button or drop down list
-	function setFocus(){
-		// Skip this if we cannot access the form elements
-		if (
-			!document.IdPList || 
-			!document.IdPList.Select
-			){
-			return;
-		}
-		
-		if (
-				document.IdPList.user_idp && 
-				document.IdPList.user_idp.selectedIndex == 0
-			){
-			// Set focus to select
-			document.IdPList.user_idp.focus();
-		} else {
-			// Set focus to submit button
-			document.IdPList.Select.focus();
-		}
-	}
-	
-	// Perform input validation on WAYF form
-	function checkForm(){
-		if(
-			document.IdPList.user_idp && 
-			document.IdPList.user_idp.selectedIndex == 0
-		){
-			alert(unescape('<?php echo getLocalString('make_selection', 'js') ?>'));
-			return false;
-		} else {
-			return true;
-		}
-	}
-	
-	// Init WAYF
-	function init(){
-		preventIframeEmbedding();
-		
-		setFocus();
-		
-		if (<?php echo ($useImprovedDropDownList) ? 'true' : 'false' ?>){
-			
-			var searchText = '<?php echo getLocalString('search_idp', 'js') ?>';
-			$("#userIdPSelection:enabled option[value='-']").text(searchText);
-			
-			// Convert select element into improved drop down list
-			$("#userIdPSelection:enabled").improveDropDown({
-				iconPath:'<?php echo $imageURL ?>/drop_icon.png',
-				noMatchesText: '<?php echo getLocalString('no_idp_found', 'js') ?>',
-				noItemsText: '<?php echo getLocalString('no_idp_available', 'js') ?>',
-				disableRemoteLogos: <?php echo ($disableRemoteLogos) ? 'true' : 'false' ?>
-			});
-		}
-	}
-	
-	// Call init function when DOM is ready
-	$(document).ready(init);
-	
-	-->
-	</script>
+        <title><?php echo getLocalString('title') ?></title> 
+        <meta http-equiv="content-type" content="text/html; charset=utf-8">
+        <meta name="keywords" content="Home Organization, Discovery Service, WAYF, Shibboleth, Login, AAI">
+        <meta name="description" content="Choose your home organization to authenticate">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+        <link rel="stylesheet" href="<?php echo $_SERVER['SCRIPT_NAME'] ?>/styles.css" type="text/css">
+        <link rel="stylesheet" href="<?php echo $_SERVER['SCRIPT_NAME'] ?>/ImprovedDropDown.css" type="text/css">
+        <script type="text/javascript" src="<?php echo $javascriptURL ?>/jquery.js"></script>
+        <script type="text/javascript" src="<?php echo $javascriptURL ?>/improvedDropDown.js"></script>
+        <script type="text/javascript">
+        <!--
+
+        // Prevent that WAYF is loaded in an IFRAME
+        function preventIframeEmbedding(){
+                if (top != self) {
+                        top.location = self.location;
+                }
+        }
+
+        // Set focus to submit button or drop down list
+        function setFocus(){
+                // Skip this if we cannot access the form elements
+                if (
+                        !document.IdPList || 
+                        !document.IdPList.Select
+                        ){
+                        return;
+                }
+
+                if (
+                                document.IdPList.user_idp && 
+                                document.IdPList.user_idp.selectedIndex == 0
+                        ){
+                        // Set focus to select
+                        document.IdPList.user_idp.focus();
+                } else {
+                        // Set focus to submit button
+                        document.IdPList.Select.focus();
+                }
+        }
+
+        // Perform input validation on WAYF form
+        function checkForm(){
+                if(
+                        document.IdPList.user_idp && 
+                        document.IdPList.user_idp.selectedIndex == 0
+                ){
+                        alert(unescape('<?php echo getLocalString('make_selection', 'js') ?>'));
+                        return false;
+                } else {
+                        return true;
+                }
+        }
+
+        // Init WAYF
+        function init(){
+                preventIframeEmbedding();
+
+                setFocus();
+
+                if (<?php echo ($useImprovedDropDownList) ? 'true' : 'false' ?>){
+
+                        var searchText = '<?php echo getLocalString('search_idp', 'js') ?>';
+                        $("#userIdPSelection:enabled option[value='-']").text(searchText);
+
+                        // Convert select element into improved drop down list
+                        $("#userIdPSelection:enabled").improveDropDown({
+                                iconPath:'<?php echo $imageURL ?>/drop_icon.png',
+                                noMatchesText: '<?php echo getLocalString('no_idp_found', 'js') ?>',
+                                noItemsText: '<?php echo getLocalString('no_idp_available', 'js') ?>',
+                                disableRemoteLogos: <?php echo ($disableRemoteLogos) ? 'true' : 'false' ?>
+                        });
+                }
+        }
+
+        // Call init function when DOM is ready
+        $(document).ready(init);
+
+        -->
+        </script>
 </head>
 
 <body>
 
 <div id="container">
-	<div class="box">
-		<div id="header">
-		 <a href="<?php echo sprintf($federationURL, $language) ?>"><img src="./images/logo.png" alt="Internet2 Logo" id="I2Logo"></a>
-		 <br /><h5>Select an Identity Provider</h5>
-		</div>
-			<div id="content">
-			
+        <div class="box">
+                <div id="header">
+                 <a href="<?php echo sprintf($federationURL, $language) ?>"><img src="./images/logo.png" alt="Internet2 Logo" id="I2Logo"></a>
+                 <br />Select an Identity Provider
+                </div>
+                        <div id="content">
+
 <!-- Body: Start -->
+
diff --git a/assets/dsroot/custom-languages.php b/assets/dsroot/custom-languages.php
index 040d9a8..8a94315 100644
--- a/assets/dsroot/custom-languages.php
+++ b/assets/dsroot/custom-languages.php
@@ -28,7 +28,7 @@
 // to an empty string in order to hide them if they are not needed.
 $langStrings['en']['about_federation'] = 'About Internet2 ICMP';  // This string can be hidden by setting it to ''
 $langStrings['en']['about_organisation'] = 'About Internet2'; // This string can be hidden by setting it to ''
-$langStrings['en']['additional_info'] = '<a href="http://www.internet2.edu/" target="_blank">Internet2</a> a member-owned advanced technology community founded by the nation’s leading higher education institutions in 1996.'; // This string can be hidden by setting it to ''
+$langStrings['en']['additional_info'] = '<a href="http://www.internet2.edu/" target="_blank">Internet2</a> a member-owned advanced technology community founded by the nationÂ’s leading higher education institutions in 1996.'; // This string can be hidden by setting it to ''
 
 // Generic strings
 $langStrings['en']['faq'] = 'FAQ'; // This string can be hidden by setting it to ''
@@ -74,3 +74,4 @@
 $langStrings['en']['last_used'] = 'Last used';
 
 ?>
+