diff --git a/churchinfo/FamilyView.php b/churchinfo/FamilyView.php
index f4738d5b7e..f275454b5c 100644
--- a/churchinfo/FamilyView.php
+++ b/churchinfo/FamilyView.php
@@ -240,7 +240,7 @@ function getFamilyPhoto($iFamilyID) {
 							}
 						?>
 					<?php if (!$bHideLatLon) { /* Lat/Lon can be hidden - General Settings */ ?>
-						<li><i class="fa-li fa fa-compass"></i><?= gettext("Latitude/Longitude") ?> <span><?= $fam_Latitude . " / ", $fam_Longitude ?></span></li>
+						<li><i class="fa-li fa fa-compass"></i><?= gettext("Latitude/Longitude") ?> <span><?= $fam_Latitude . " / " . $fam_Longitude ?></span></li>
 					<?php }
 					if (!$bHideFamilyNewsletter) { /* Newsletter can be hidden - General Settings */ ?>
 						<li><i class="fa-li fa fa-hacker-news"></i><?= gettext("Send newsletter:") ?> <span><?= $fam_SendNewsLetter ?></span></li>
@@ -252,24 +252,24 @@ function getFamilyPhoto($iFamilyID) {
 						<li><i class="fa-li fa fa-phone"></i><?= gettext("Envelope Number") ?> <span><?= $fam_Envelope ?></span></li>
 					<?php  }
 					if ($sHomePhone != "") { ?>
-						<li><i class="fa-li fa fa-phone"></i><?= gettext("Home Phone:") ?> <span><? echo "<a href=\"tel:" . $sHomePhone . "\">" . $sHomePhone . "</a>";?></span></li>
+						<li><i class="fa-li fa fa-phone"></i><?= gettext("Home Phone:") ?> <span><a href="tel:<?= $sHomePhone ?>"><?= $sHomePhone ?></a></span></li>
 					<?php  }
 					if ($sWorkPhone != "") { ?>
-						<li><i class="fa-li fa fa-building"></i><?= gettext("Work Phone:") ?> <span><? echo "<a href=\"tel:" . $sWorkPhone . "\">" . $sWorkPhone . "</a>";?></span></li>
+						<li><i class="fa-li fa fa-building"></i><?= gettext("Work Phone:") ?> <span><a href="tel:<?= $sWorkPhone ?>"><?= $sWorkPhone ?></a></span></li>
 					<?php  }
 					if ($sCellPhone != "") { ?>
-						<li><i class="fa-li fa fa-mobile"></i><?= gettext("Mobile Phone:") ?> <span><? echo "<a href=\"tel:" . $sCellPhone . "\">" . $sCellPhone . "</a>";?></span></li>
+						<li><i class="fa-li fa fa-mobile"></i><?= gettext("Mobile Phone:") ?> <span><a href="tel:<?= $sCellPhone ?>"><?= $sCellPhone ?></a></span></li>
 					<?php  }
 					if ($fam_Email != "") { ?>
 						<li><i class="fa-li fa fa-envelope"></i><?= gettext("Email:") ?><a href="mailto:<?= $fam_Email ?>"> <span><?= $fam_Email ?></span></a></li>
 						<?php if ($mailchimp->isActive()) { ?>
-							<li><i class="fa-li glyphicon glyphicon-send"></i><?= gettext("Email:") ?> <span><?php echo $mailchimp->isEmailInMailChimp($fam_Email); ?></span></a></li>
+							<li><i class="fa-li glyphicon glyphicon-send"></i><?= gettext("Email:") ?> <span><?= $mailchimp->isEmailInMailChimp($fam_Email) ?></span></a></li>
 					<?php }
 					}
 					// Display the left-side custom fields
 					while ($Row = mysql_fetch_array($rsFamCustomFields)) {
 						extract($Row);
-						if (($aSecurityType[$fam_custom_FieldSec] == 'bAll') or ($_SESSION[$aSecurityType[$fam_custom_FieldSec]]))
+						if (($aSecurityType[$fam_custom_FieldSec] == 'bAll') || ($_SESSION[$aSecurityType[$fam_custom_FieldSec]]))
 						{
 							$currentData = trim($aFamCustomData[$fam_custom_Field]);
 							if ($type_ID == 11) $fam_custom_Special = $sPhoneCountry;
diff --git a/churchinfo/PersonView.php b/churchinfo/PersonView.php
index f82c9a3652..439b1ee9b4 100644
--- a/churchinfo/PersonView.php
+++ b/churchinfo/PersonView.php
@@ -302,25 +302,25 @@
 					<?php } if (!$bHideFriendDate) { /* Friend Date can be hidden - General Settings */ ?>
 					<li><i class="fa-li fa fa-tasks"></i><?= gettext("Friend Date:") ?> <span><?= FormatDate($per_FriendDate,false) ?></span></li>
 					<?php } if ($sCellPhone) {?>
-					<li><i class="fa-li fa fa-mobile-phone"></i><?= gettext("Mobile Phone:") ?> <span><? echo "<a href=\"tel:" . $sCellPhone . "\">" . $sCellPhone . "</a>"; ?></span></li>
+					<li><i class="fa-li fa fa-mobile-phone"></i><?= gettext("Mobile Phone:") ?> <span><a href="tel:<?= $sCellPhone ?>"><?= $sCellPhone ?></a></span></li>
 					<?php }
 					if ($sHomePhone) {
 						?>
-						<li><i class="fa-li fa fa-phone"></i><?= gettext("Home Phone:") ?><span><?echo "<a href=\"tel:" . $sHomePhone . "\">" . $sHomePhone . "</a>";?></span></li>
+						<li><i class="fa-li fa fa-phone"></i><?= gettext("Home Phone:") ?> <span><a href="tel:<?= $sHomePhone ?>"><?= $sHomePhone ?></a></span></li>
 					<?php
 					}
 					if ($sEmail != "") { ?>
-					<li><i class="fa-li fa fa-envelope"></i><?= gettext("Email:") ?> <span><?php echo "<a href=\"mailto:" . $sUnformattedEmail . "\">" . $sEmail . "</a>"; ?></span></li>
+					<li><i class="fa-li fa fa-envelope"></i><?= gettext("Email:") ?> <span><a href="mailto:<?= $sUnformattedEmail ?>"><?= $sEmail ?></a></span></li>
 						<?php if ($mailchimp->isActive()) { ?>
 							<li><i class="fa-li glyphicon glyphicon-send"></i>MailChimp: <span><?= $mailchimp->isEmailInMailChimp($sEmail); ?></span></li>
 						<?php }
 					}
 					if ($sWorkPhone) {
 					?>
-						<li><i class="fa-li fa fa-phone"></i><?= gettext("Work Phone:") ?> <span><? echo "<a href=\"tel:" . $sWorkPhone . "\">" . $sWorkPhone . "</a>";?></span></li>
+						<li><i class="fa-li fa fa-phone"></i><?= gettext("Work Phone:") ?> <span><a href="tel:<?= $sWorkPhone ?>"><?= $sWorkPhone ?></a></span></li>
 					<?php } ?>
 					<?php if ($per_WorkEmail != "") { ?>
-					<li><i class="fa-li fa fa-envelope"></i><?= gettext("Work/Other Email:") ?> <span><?php  echo "<a href=\"mailto:" . $per_WorkEmail . "\">" . $per_WorkEmail . "</a>"; ?></span></li>
+					<li><i class="fa-li fa fa-envelope"></i><?= gettext("Work/Other Email:") ?> <span><a href="mailto:<?= $per_WorkEmail ?>"><?= $per_WorkEmail ?></a></span></li>
 						<?php if ($mailchimp->isActive()) { ?>
 							<li><i class="fa-li glyphicon glyphicon-send"></i>MailChimp: <span><?= $mailchimp->isEmailInMailChimp($per_WorkEmail); ?></span></li>
 						<?php