diff --git a/interface/usergroup/addrbook_edit.php b/interface/usergroup/addrbook_edit.php
index 3c0745f2d5b..bcdd87b8802 100644
--- a/interface/usergroup/addrbook_edit.php
+++ b/interface/usergroup/addrbook_edit.php
@@ -44,7 +44,7 @@ function rbvalue($rbname) {
 <html>
 <head>
 <title><?php echo $userid ? "Edit" : "Add New" ?> Person</title>
-<link rel=stylesheet href='<?php echo $css_header ?>' type='text/css'>
+<link rel="stylesheet" href='<?php echo $css_header ?>' type='text/css'>
 
 <style>
 td { font-size:10pt; }
@@ -75,7 +75,7 @@ function rbvalue($rbname) {
 
 </head>
 
-<body <?echo $top_bg_line;?>>
+<body class="body_top">
 <?php
  // If we are saving, then save and close the window.
  //
diff --git a/interface/usergroup/addrbook_list.php b/interface/usergroup/addrbook_list.php
index 99b8bb404ec..9c9abd2bed2 100644
--- a/interface/usergroup/addrbook_list.php
+++ b/interface/usergroup/addrbook_list.php
@@ -24,7 +24,7 @@
 
 <head>
 
-<link rel=stylesheet href='<? echo $css_header ?>' type='text/css'>
+<link rel="stylesheet" href='<?php echo $css_header ?>' type='text/css'>
 <title><?php xl('Address Book','e'); ?></title>
 
 <style>
@@ -91,7 +91,7 @@ function doedclick(userid) {
 
 </head>
 
-<body <?echo $top_bg_line;?>>
+<body class="body_top">
 
 <form method='post' action='addrbook_list.php'>
 
@@ -102,16 +102,16 @@ function doedclick(userid) {
  </tr>
  <tr class='search'> <!-- bgcolor='#ddddff' -->
   <td>
-   <?xl('First Name:','e')?>
+   <?php xl('First Name:','e')?>
    <input type='text' name='form_fname' size='10' value='<?php echo $form_fname; ?>'
     class='inputtext' title='<?php xl("All or part of the first name","e") ?>' />&nbsp;
-   <?xl('Last Name:','e')?>
+   <?php xl('Last Name:','e')?>
    <input type='text' name='form_lname' size='10' value='<?php echo $form_lname; ?>'
     class='inputtext' title='<?php xl("All or part of the last name","e") ?>' />&nbsp;
-   <?xl('Specialty:','e')?>
+   <?php xl('Specialty:','e')?>
    <input type='text' name='form_specialty' size='10' value='<?php echo $form_specialty; ?>'
     class='inputtext' title='<?php xl("Any part of the desired specialty","e") ?>' />&nbsp;&nbsp;
-   <input type='submit' class='button' name='form_search' value='<?xl("Search","e")?>' />
+   <input type='submit' class='button' name='form_search' value='<?php xl("Search","e")?>' />
   </td>
   <td align='right'>
    <input type='button' class='button' value='Add New' onclick='doedclick(0)' />
diff --git a/interface/usergroup/adminacl.php b/interface/usergroup/adminacl.php
index 7810375024f..4261ca2af3d 100644
--- a/interface/usergroup/adminacl.php
+++ b/interface/usergroup/adminacl.php
@@ -478,7 +478,7 @@ function generic_click(cthis) {
  });
  </script>
 		
- <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+ <link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
  <style type="text/css">
   body {
    padding: 5pt 15pt 5pt 5pt;
@@ -507,7 +507,7 @@ function generic_click(cthis) {
  </style>	
 </head>
 
-<body<?php echo $top_bg_line;?>>
+<body class="body_top">
  <span class='title'><?php xl('Access Control List Administration','e'); ?></span>
  <br><br>	
  <div id='membership_edit'>
diff --git a/interface/usergroup/facility_admin.php b/interface/usergroup/facility_admin.php
index 44260ef26f6..441d0b16488 100644
--- a/interface/usergroup/facility_admin.php
+++ b/interface/usergroup/facility_admin.php
@@ -38,16 +38,16 @@
 <html>
 <head>
 
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
 
 </head>
-<body <?php echo $top_bg_line; ?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+<body class="body_top">
 
 <span class="title"><?php xl('Edit Facility Information','e'); ?></span>
 
 <form name='facility' method='post' action="facility_admin.php">
 <input type=hidden name=mode value="facility">
-<input type=hidden name=fid value="<?echo $my_fid;?>">
+<input type=hidden name=fid value="<?php echo $my_fid;?>">
 <?php $facility = sqlQuery("select * from facility where id='$my_fid'"); ?>
 <br><br>
 <table border=0 cellpadding=0 cellspacing=0>
diff --git a/interface/usergroup/user_admin.php b/interface/usergroup/user_admin.php
index deba4403b83..339ed30281b 100644
--- a/interface/usergroup/user_admin.php
+++ b/interface/usergroup/user_admin.php
@@ -1,241 +1,241 @@
-<?php
-require_once("../globals.php");
-require_once("../../library/acl.inc");
-require_once("$srcdir/md5.js");
-require_once("$srcdir/sql.inc");
-require_once(dirname(__FILE__) . "/../../library/classes/WSProvider.class.php");
-?>
-
-<html>
-<head>
-
-<link rel=stylesheet href="<?php echo $css_header; ?>" type="text/css">
-
-</head>
-<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
-<a href="usergroup_admin.php"><span class="title"><?php xl('User Administration','e'); ?></span></a>
-<br><br>
-
-<?php
-if (!$_GET["id"] || !acl_check('admin', 'users'))
-  exit();
-
-if ($_GET["mode"] == "update") {
-  if ($_GET["username"]) {
-    $tqvar = addslashes($_GET["username"]);
-    $user_data = mysql_fetch_array(sqlStatement("select * from users where id={$_GET["id"]}"));
-    sqlStatement("update users set username='$tqvar' where id={$_GET["id"]}");
-    sqlStatement("update groups set user='$tqvar' where user='". $user_data["username"]  ."'");
-    //echo "query was: " ."update groups set user='$tqvar' where user='". $user_data["username"]  ."'" ;
-  }
-  if ($_GET["taxid"]) {
-    $tqvar = addslashes($_GET["taxid"]);
-    sqlStatement("update users set federaltaxid='$tqvar' where id={$_GET["id"]}");
-  }
-  if ($_GET["drugid"]) {
-    $tqvar = addslashes($_GET["drugid"]);
-    sqlStatement("update users set federaldrugid='$tqvar' where id={$_GET["id"]}");
-  }
-  if ($_GET["upin"]) {
-    $tqvar = addslashes($_GET["upin"]);
-    sqlStatement("update users set upin='$tqvar' where id={$_GET["id"]}");
-  }
-    if ($_GET["npi"]) {
-    $tqvar = addslashes($_GET["npi"]);
-    sqlStatement("update users set npi='$tqvar' where id={$_GET["id"]}");
-  }
-  if ($_GET["lname"]) {
-    $tqvar = addslashes($_GET["lname"]);
-    sqlStatement("update users set lname='$tqvar' where id={$_GET["id"]}");
-  }
-  if ($_GET["job"]) {
-    $tqvar = addslashes($_GET["job"]);
-    sqlStatement("update users set specialty='$tqvar' where id={$_GET["id"]}");
-  }
-  if ($_GET["mname"]) {
-          $tqvar = addslashes($_GET["mname"]);
-          sqlStatement("update users set mname='$tqvar' where id={$_GET["id"]}");
-  }
-  if ($_GET["facility_id"]) {
-          $tqvar = addslashes($_GET["facility_id"]);
-          sqlStatement("update users set facility_id = '$tqvar' where id = {$_GET["id"]}");
-          //(CHEMED) Update facility name when changing the id
-          sqlStatement("update users set facility = (SELECT facility.name FROM facility WHERE facility.id = '$tqvar' LIMIT 1) where id = {$_GET["id"]}");
-          //END (CHEMED)
-  }
-  if ($_GET["fname"]) {
-          $tqvar = addslashes($_GET["fname"]);
-          sqlStatement("update users set fname='$tqvar' where id={$_GET["id"]}");
-  }
-
-  //(CHEMED) Calendar UI preference
-  if ($_GET["cal_ui"]) {
-          $tqvar = addslashes($_GET["cal_ui"]);
-          sqlStatement("update users set cal_ui = '$tqvar' where id = {$_GET["id"]}");
-  }
-  //END (CHEMED) Calendar UI preference
-
-  if ($_GET["newauthPass"] && $_GET["newauthPass"] != "d41d8cd98f00b204e9800998ecf8427e") { // account for empty
-    $tqvar = addslashes($_GET["newauthPass"]);
-    sqlStatement("update users set password='$tqvar' where id={$_GET["id"]}");
-  }
-
-  $tqvar  = $_GET["authorized"] ? 1 : 0;
-  $actvar = $_GET["active"]     ? 1 : 0;
-
-  sqlStatement("UPDATE users SET authorized = $tqvar, active = $actvar, " .
-    "see_auth = '" . $_GET['see_auth'] . "' WHERE " .
-    "id = {$_GET["id"]}");
-
-  if ($_GET["comments"]) {
-    $tqvar = addslashes($_GET["comments"]);
-    sqlStatement("update users set info = '$tqvar' where id = {$_GET["id"]}");
-  }
-
-  if (isset($phpgacl_location) && acl_check('admin', 'acl') && $_GET["access_group"]) {
-    // Set the access control group of user
-    $user_data = mysql_fetch_array(sqlStatement("select username from users where id={$_GET["id"]}"));
-    set_user_aro($_GET["access_group"], $user_data["username"], $_GET["fname"], $_GET["mname"], $_GET["lname"]);
-  }
-
-  $ws = new WSProvider($_GET['id']);
-}
-
-$res = sqlStatement("select * from users where id={$_GET["id"]}");
-for ($iter = 0;$row = sqlFetchArray($res);$iter++)
-                $result[$iter] = $row;
-$iter = $result[0];
-
-?>
-<FORM NAME="user_form" METHOD="GET" ACTION="user_admin.php">
-<TABLE border=0 cellpadding=0 cellspacing=0>
-<TR>
-<TD><span class=text><? xl('Username','e'); ?>: </span></TD><TD><input type=entry name=username size=20 value="<? echo $iter["username"]; ?>" disabled> &nbsp;</td>
-<TD><span class=text><? xl('Password','e'); ?>: </span></TD><TD class='text'><input type=password name=clearPass size=20 value=""> * <? xl('Leave blank to keep password unchanged.','e'); ?></td>
-</TR>
-
-<TR>
-<td><span class="text">&nbsp;</span></td><td>&nbsp;</td>
-<TD><span class=text><? xl('Authorized','e'); ?>: </TD>
-<TD>
- <input type="checkbox" name="authorized"<?php if ($iter["authorized"]) echo " checked"; ?> />
- &nbsp;&nbsp;<span class='text'><? xl('Active','e'); ?>:
- <input type="checkbox" name="active"<?php if ($iter["active"]) echo " checked"; ?> />
-</TD>
-</TR>
-
-<TR>
-<TD><span class=text><? xl('First Name','e'); ?>: </span></TD>
-<TD><input type=entry name=fname size=20 value="<? echo $iter["fname"]; ?>"></td>
-<td><span class=text><? xl('Middle Name','e'); ?>: </span></TD><td><input type=entry name=mname size=20 value="<? echo $iter["mname"]; ?>"></td>
-</TR>
-
-<TR>
-<td><span class=text><? xl('Last Name','e'); ?>: </span></td><td><input type=entry name=lname size=20 value="<? echo $iter["lname"]; ?>"></td>
-<td><span class=text><? xl('Default Facility','e'); ?>: </span></td><td><select name=facility_id>
-<?php
-$fres = sqlStatement("select * from facility where service_location != 0 order by name");
-if ($fres) {
-for ($iter2 = 0; $frow = sqlFetchArray($fres); $iter2++)
-                $result[$iter2] = $frow;
-foreach($result as $iter2) {
-?>
-<option value="<?php echo $iter2['id']; ?>" <?php if ($iter['facility_id'] == $iter2['id']) echo "selected"; ?>><?php echo $iter2['name']; ?></option>
-<?php
-}
-}
-?>
-</select></td>
-</tr>
-
-<TR>
-<TD><span class=text><? xl('Federal Tax ID','e'); ?>: </span></TD><TD><input type=text name=taxid size=20 value="<? echo $iter["federaltaxid"]?>"></td>
-<TD><span class=text><? xl('Federal Drug ID','e'); ?>: </span></TD><TD><input type=text name=drugid size=20 value="<? echo $iter["federaldrugid"]?>"></td>
-</TR>
-
-<tr>
-<td><span class="text"><? xl('UPIN','e'); ?>: </span></td><td><input type="text" name="upin" size="20" value="<? echo $iter["upin"]?>"></td>
-<td class='text'><? xl('See Authorizations','e'); ?>: </td>
-<td><select name="see_auth">
-<?php
- foreach (array(1 => xl('None'), 2 => xl('Only Mine'), 3 => xl('All')) as $key => $value)
- {
-  echo " <option value='$key'";
-  if ($key == $iter['see_auth']) echo " selected";
-  echo ">$value</option>\n";
- }
-?>
-</select></td>
-</tr>
-<tr>
-<td><span class="text"><? xl('NPI','e'); ?>: </span></td><td><input type="text" name="npi" size="20" value="<? echo $iter["npi"]?>"></td>
-
-<td><span class="text"><? xl('Job Description','e'); ?>: </span></td><td><input type="text" name="job" size="20" value="<? echo $iter["specialty"]?>"></td>
-</tr>
-<!-- (CHEMED) Calendar UI preference -->
-<tr>
-<td><span class="text"><? xl('Calendar UI','e'); ?>: </span></td><td><select name="cal_ui">
-<?php
- foreach (array(1 => xl('Default'), 2 => xl('Fancy'), 3 => xl('Outlook')) as $key => $value)
- {
-  echo " <option value='$key'";
-  if ($key == $iter['cal_ui']) echo " selected";
-  echo ">$value</option>\n";
- }
-?>
-</select></td>
-<td>&nbsp;</td>
-</tr>
-<!-- END (CHEMED) Calendar UI preference -->
-
-<?php
- // Collect the access control group of user
- if (isset($phpgacl_location) && acl_check('admin', 'acl')) {
-?>
-  <tr>
-  <td class='text'><? xl('Access Control','e'); ?>:</td>
-  <td><select name="access_group[]" multiple>
-  <?php
-   $list_acl_groups = acl_get_group_title_list();
-   $username_acl_groups = acl_get_group_titles($iter["username"]);
-   if (!$username_acl_groups) {
-    //set default if not yet set
-    $username_acl_groups = array('Administrators');
-   }
-   foreach ($list_acl_groups as $value) {
-    if (in_array($value,$username_acl_groups)) {
-     echo " <option selected>$value</option>\n";
-    }
-    else {
-     echo " <option>$value</option>\n";
-    }
-   }
-  ?>
-  </select></td></tr>
-<?php
- }
-?>
-
-</tr>
-</table>
-
-<span class=text><? xl('Additional Info','e'); ?>:</span><br>
-<textarea name="comments" wrap=auto rows=4 cols=30><? echo $iter["info"];?></textarea>
-
-<br>&nbsp;&nbsp;&nbsp;
-<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? echo $_GET["id"]; ?>">
-<INPUT TYPE="HIDDEN" NAME="mode" VALUE="update">
-<INPUT TYPE="HIDDEN" NAME="newauthPass" VALUE="">
-<INPUT TYPE="Submit" VALUE=<? xl('Save Changes','e'); ?> onClick="javascript:this.form.newauthPass.value=MD5(this.form.clearPass.value);this.form.clearPass.value='';">
-&nbsp;&nbsp;&nbsp;
-<a href="usergroup_admin.php" class=link_submit>[<? xl('Back','e'); ?>]</font></a>
-</FORM>
-
-<br><br>
-</BODY>
-</HTML>
-
-<?php
-//  d41d8cd98f00b204e9800998ecf8427e == blank
-?>
\ No newline at end of file
+<?php
+require_once("../globals.php");
+require_once("../../library/acl.inc");
+require_once("$srcdir/md5.js");
+require_once("$srcdir/sql.inc");
+require_once(dirname(__FILE__) . "/../../library/classes/WSProvider.class.php");
+?>
+
+<html>
+<head>
+
+<link rel="stylesheet" href="<?php echo $css_header; ?>" type="text/css">
+
+</head>
+<body class="body_top">
+
+<a href="usergroup_admin.php"><span class="title"><?php xl('User Administration','e'); ?></span></a>
+<br><br>
+
+<?php
+if (!$_GET["id"] || !acl_check('admin', 'users'))
+  exit();
+
+if ($_GET["mode"] == "update") {
+  if ($_GET["username"]) {
+    $tqvar = addslashes($_GET["username"]);
+    $user_data = mysql_fetch_array(sqlStatement("select * from users where id={$_GET["id"]}"));
+    sqlStatement("update users set username='$tqvar' where id={$_GET["id"]}");
+    sqlStatement("update groups set user='$tqvar' where user='". $user_data["username"]  ."'");
+    //echo "query was: " ."update groups set user='$tqvar' where user='". $user_data["username"]  ."'" ;
+  }
+  if ($_GET["taxid"]) {
+    $tqvar = addslashes($_GET["taxid"]);
+    sqlStatement("update users set federaltaxid='$tqvar' where id={$_GET["id"]}");
+  }
+  if ($_GET["drugid"]) {
+    $tqvar = addslashes($_GET["drugid"]);
+    sqlStatement("update users set federaldrugid='$tqvar' where id={$_GET["id"]}");
+  }
+  if ($_GET["upin"]) {
+    $tqvar = addslashes($_GET["upin"]);
+    sqlStatement("update users set upin='$tqvar' where id={$_GET["id"]}");
+  }
+    if ($_GET["npi"]) {
+    $tqvar = addslashes($_GET["npi"]);
+    sqlStatement("update users set npi='$tqvar' where id={$_GET["id"]}");
+  }
+  if ($_GET["lname"]) {
+    $tqvar = addslashes($_GET["lname"]);
+    sqlStatement("update users set lname='$tqvar' where id={$_GET["id"]}");
+  }
+  if ($_GET["job"]) {
+    $tqvar = addslashes($_GET["job"]);
+    sqlStatement("update users set specialty='$tqvar' where id={$_GET["id"]}");
+  }
+  if ($_GET["mname"]) {
+          $tqvar = addslashes($_GET["mname"]);
+          sqlStatement("update users set mname='$tqvar' where id={$_GET["id"]}");
+  }
+  if ($_GET["facility_id"]) {
+          $tqvar = addslashes($_GET["facility_id"]);
+          sqlStatement("update users set facility_id = '$tqvar' where id = {$_GET["id"]}");
+          //(CHEMED) Update facility name when changing the id
+          sqlStatement("update users set facility = (SELECT facility.name FROM facility WHERE facility.id = '$tqvar' LIMIT 1) where id = {$_GET["id"]}");
+          //END (CHEMED)
+  }
+  if ($_GET["fname"]) {
+          $tqvar = addslashes($_GET["fname"]);
+          sqlStatement("update users set fname='$tqvar' where id={$_GET["id"]}");
+  }
+
+  //(CHEMED) Calendar UI preference
+  if ($_GET["cal_ui"]) {
+          $tqvar = addslashes($_GET["cal_ui"]);
+          sqlStatement("update users set cal_ui = '$tqvar' where id = {$_GET["id"]}");
+  }
+  //END (CHEMED) Calendar UI preference
+
+  if ($_GET["newauthPass"] && $_GET["newauthPass"] != "d41d8cd98f00b204e9800998ecf8427e") { // account for empty
+    $tqvar = addslashes($_GET["newauthPass"]);
+    sqlStatement("update users set password='$tqvar' where id={$_GET["id"]}");
+  }
+
+  $tqvar  = $_GET["authorized"] ? 1 : 0;
+  $actvar = $_GET["active"]     ? 1 : 0;
+
+  sqlStatement("UPDATE users SET authorized = $tqvar, active = $actvar, " .
+    "see_auth = '" . $_GET['see_auth'] . "' WHERE " .
+    "id = {$_GET["id"]}");
+
+  if ($_GET["comments"]) {
+    $tqvar = addslashes($_GET["comments"]);
+    sqlStatement("update users set info = '$tqvar' where id = {$_GET["id"]}");
+  }
+
+  if (isset($phpgacl_location) && acl_check('admin', 'acl') && $_GET["access_group"]) {
+    // Set the access control group of user
+    $user_data = mysql_fetch_array(sqlStatement("select username from users where id={$_GET["id"]}"));
+    set_user_aro($_GET["access_group"], $user_data["username"], $_GET["fname"], $_GET["mname"], $_GET["lname"]);
+  }
+
+  $ws = new WSProvider($_GET['id']);
+}
+
+$res = sqlStatement("select * from users where id={$_GET["id"]}");
+for ($iter = 0;$row = sqlFetchArray($res);$iter++)
+                $result[$iter] = $row;
+$iter = $result[0];
+
+?>
+<FORM NAME="user_form" METHOD="GET" ACTION="user_admin.php">
+<TABLE border=0 cellpadding=0 cellspacing=0>
+<TR>
+<TD><span class=text><?php xl('Username','e'); ?>: </span></TD><TD><input type=entry name=username size=20 value="<?php echo $iter["username"]; ?>" disabled> &nbsp;</td>
+<TD><span class=text><?php xl('Password','e'); ?>: </span></TD><TD class='text'><input type=password name=clearPass size=20 value=""> * <?php xl('Leave blank to keep password unchanged.','e'); ?></td>
+</TR>
+
+<TR>
+<td><span class="text">&nbsp;</span></td><td>&nbsp;</td>
+<TD><span class=text><?php xl('Authorized','e'); ?>: </TD>
+<TD>
+ <input type="checkbox" name="authorized"<?php if ($iter["authorized"]) echo " checked"; ?> />
+ &nbsp;&nbsp;<span class='text'><?php xl('Active','e'); ?>:
+ <input type="checkbox" name="active"<?php if ($iter["active"]) echo " checked"; ?> />
+</TD>
+</TR>
+
+<TR>
+<TD><span class=text><?php xl('First Name','e'); ?>: </span></TD>
+<TD><input type=entry name=fname size=20 value="<?php echo $iter["fname"]; ?>"></td>
+<td><span class=text><?php xl('Middle Name','e'); ?>: </span></TD><td><input type=entry name=mname size=20 value="<?php echo $iter["mname"]; ?>"></td>
+</TR>
+
+<TR>
+<td><span class=text><?php xl('Last Name','e'); ?>: </span></td><td><input type=entry name=lname size=20 value="<?php echo $iter["lname"]; ?>"></td>
+<td><span class=text><?php xl('Default Facility','e'); ?>: </span></td><td><select name=facility_id>
+<?php
+$fres = sqlStatement("select * from facility where service_location != 0 order by name");
+if ($fres) {
+for ($iter2 = 0; $frow = sqlFetchArray($fres); $iter2++)
+                $result[$iter2] = $frow;
+foreach($result as $iter2) {
+?>
+<option value="<?php echo $iter2['id']; ?>" <?php if ($iter['facility_id'] == $iter2['id']) echo "selected"; ?>><?php echo $iter2['name']; ?></option>
+<?php
+}
+}
+?>
+</select></td>
+</tr>
+
+<TR>
+<TD><span class=text><?php xl('Federal Tax ID','e'); ?>: </span></TD><TD><input type=text name=taxid size=20 value="<?php echo $iter["federaltaxid"]?>"></td>
+<TD><span class=text><?php xl('Federal Drug ID','e'); ?>: </span></TD><TD><input type=text name=drugid size=20 value="<?php echo $iter["federaldrugid"]?>"></td>
+</TR>
+
+<tr>
+<td><span class="text"><?php xl('UPIN','e'); ?>: </span></td><td><input type="text" name="upin" size="20" value="<?php echo $iter["upin"]?>"></td>
+<td class='text'><?php xl('See Authorizations','e'); ?>: </td>
+<td><select name="see_auth">
+<?php
+ foreach (array(1 => xl('None'), 2 => xl('Only Mine'), 3 => xl('All')) as $key => $value)
+ {
+  echo " <option value='$key'";
+  if ($key == $iter['see_auth']) echo " selected";
+  echo ">$value</option>\n";
+ }
+?>
+</select></td>
+</tr>
+<tr>
+<td><span class="text"><?php xl('NPI','e'); ?>: </span></td><td><input type="text" name="npi" size="20" value="<?php echo $iter["npi"]?>"></td>
+
+<td><span class="text"><?php xl('Job Description','e'); ?>: </span></td><td><input type="text" name="job" size="20" value="<?php echo $iter["specialty"]?>"></td>
+</tr>
+<!-- (CHEMED) Calendar UI preference -->
+<tr>
+<td><span class="text"><?php xl('Calendar UI','e'); ?>: </span></td><td><select name="cal_ui">
+<?php
+ foreach (array(1 => xl('Default'), 2 => xl('Fancy'), 3 => xl('Outlook')) as $key => $value)
+ {
+  echo " <option value='$key'";
+  if ($key == $iter['cal_ui']) echo " selected";
+  echo ">$value</option>\n";
+ }
+?>
+</select></td>
+<td>&nbsp;</td>
+</tr>
+<!-- END (CHEMED) Calendar UI preference -->
+
+<?php
+ // Collect the access control group of user
+ if (isset($phpgacl_location) && acl_check('admin', 'acl')) {
+?>
+  <tr>
+  <td class='text'><?php xl('Access Control','e'); ?>:</td>
+  <td><select name="access_group[]" multiple>
+  <?php
+   $list_acl_groups = acl_get_group_title_list();
+   $username_acl_groups = acl_get_group_titles($iter["username"]);
+   if (!$username_acl_groups) {
+    //set default if not yet set
+    $username_acl_groups = array('Administrators');
+   }
+   foreach ($list_acl_groups as $value) {
+    if (in_array($value,$username_acl_groups)) {
+     echo " <option selected>$value</option>\n";
+    }
+    else {
+     echo " <option>$value</option>\n";
+    }
+   }
+  ?>
+  </select></td></tr>
+<?php
+ }
+?>
+
+</tr>
+</table>
+
+<span class=text><?php xl('Additional Info','e'); ?>:</span><br>
+<textarea name="comments" wrap=auto rows=4 cols=30><?php echo $iter["info"];?></textarea>
+
+<br>&nbsp;&nbsp;&nbsp;
+<INPUT TYPE="HIDDEN" NAME="id" VALUE="<?php echo $_GET["id"]; ?>">
+<INPUT TYPE="HIDDEN" NAME="mode" VALUE="update">
+<INPUT TYPE="HIDDEN" NAME="newauthPass" VALUE="">
+<INPUT TYPE="Submit" VALUE=<?php xl('Save Changes','e'); ?> onClick="javascript:this.form.newauthPass.value=MD5(this.form.clearPass.value);this.form.clearPass.value='';">
+&nbsp;&nbsp;&nbsp;
+<a href="usergroup_admin.php" class=link_submit>[<?php xl('Back','e'); ?>]</font></a>
+</FORM>
+
+<br><br>
+</BODY>
+</HTML>
+
+<?php
+//  d41d8cd98f00b204e9800998ecf8427e == blank
+?>
diff --git a/interface/usergroup/user_info.php b/interface/usergroup/user_info.php
index b7a868cfcbe..3fc6f6b4485 100644
--- a/interface/usergroup/user_info.php
+++ b/interface/usergroup/user_info.php
@@ -6,12 +6,12 @@
 <html>
 <head>
 
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
 
 </head>
-<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+<body class="body_top">
 
-<span class="title"><? xl('Password Change','e'); ?></span>
+<span class="title"><?php xl('Password Change','e'); ?></span>
 <br><br>
 
 <?php
@@ -35,32 +35,32 @@
 $iter = $result[0];
 
 ?>
-<span class="text"><? xl('Once you change your password, you will have to re-login.','e'); ?><br></span>
+<span class="text"><?php xl('Once you change your password, you will have to re-login.','e'); ?><br></span>
 <FORM NAME="user_form" METHOD="GET" ACTION="user_info.php"
  onsubmit="top.restoreSession()">
 <TABLE>
 <TR>
-<TD><span class=text><? xl('Real Name','e'); ?>: </span></TD>
-<TD><span class=text><? echo $iter["realname"]; ?></span></td>
+<TD><span class=text><?php xl('Real Name','e'); ?>: </span></TD>
+<TD><span class=text><?php echo $iter["realname"]; ?></span></td>
 </TR>
 
 <TR>
-<TD><span class=text><? xl('Username','e'); ?>: </span></TD>
-<TD><span class=text><? echo $iter["username"]; ?></span></td>
+<TD><span class=text><?php xl('Username','e'); ?>: </span></TD>
+<TD><span class=text><?php echo $iter["username"]; ?></span></td>
 </TR>
 
 <TR>
-<TD><span class=text><? xl('Password','e'); ?>: </span></TD>
+<TD><span class=text><?php xl('Password','e'); ?>: </span></TD>
 <TD><input type=password name=clearPass size=20 value=""></td>
 </TR>
 <TR>
-<TD><span class=text><? xl('Password','e'); ?> (<?xl('Again','e');?>): </span></TD>
+<TD><span class=text><?php xl('Password','e'); ?> (<?xl('Again','e');?>): </span></TD>
 <TD><input type=password name=clearPass2 size=20 value=""></td>
 </TR>
 
 </TABLE>
 <br>&nbsp;&nbsp;&nbsp;
-<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? echo $_GET["id"]; ?>">
+<INPUT TYPE="HIDDEN" NAME="id" VALUE="<?php echo $_GET["id"]; ?>">
 <INPUT TYPE="HIDDEN" NAME="mode" VALUE="update">
 <INPUT TYPE="HIDDEN" NAME="authPass" VALUE="">
 <INPUT TYPE="HIDDEN" NAME="authPass2" VALUE="">
diff --git a/interface/usergroup/usergroup_admin.php b/interface/usergroup/usergroup_admin.php
index 6008a2c94f5..409cea15031 100644
--- a/interface/usergroup/usergroup_admin.php
+++ b/interface/usergroup/usergroup_admin.php
@@ -130,12 +130,12 @@
 <html>
 <head>
 
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
 
 </head>
-<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+<body class="body_top">
 
-<span class="title"><? xl('User and Facility Administration','e'); ?></span>
+<span class="title"><?php xl('User and Facility Administration','e'); ?></span>
 
 <br><br>
 
@@ -147,40 +147,40 @@
 <form name='facility' method='post' action="usergroup_admin.php"
  onsubmit='return top.restoreSession()'>
 <input type=hidden name=mode value="facility">
-<span class=bold><? xl('New Facility Information','e'); ?>: </span>
+<span class="bold"><?php xl('New Facility Information','e'); ?>: </span>
 </td><td>
 
 <table border=0 cellpadding=0 cellspacing=0>
 <tr>
-<td><span class=text><? xl('Name','e'); ?>: </span></td><td><input type=entry name=facility size=20 value=""></td>
-<td><span class=text><? xl('Phone','e'); ?>: </span></td><td><input type=entry name=phone size=20 value=""></td>
+<td><span class="text"><?php xl('Name','e'); ?>: </span></td><td><input type=entry name=facility size=20 value=""></td>
+<td><span class="text"><?php xl('Phone','e'); ?>: </span></td><td><input type=entry name=phone size=20 value=""></td>
 </tr>
 <tr>
 <td>&nbsp;</td><td>&nbsp;</td>
-<td><span class=text><? xl('Fax','e'); ?>: </span></td><td><input type=entry name=fax size=20 value=""></td>
+<td><span class="text"><?php xl('Fax','e'); ?>: </span></td><td><input type=entry name=fax size=20 value=""></td>
 </tr>
 <tr>
-<td><span class=text><? xl('Address','e'); ?>: </span></td><td><input type=entry size=20 name=street value=""></td>
-<td><span class=text><? xl('City','e'); ?>: </span></td><td><input type=entry size=20 name=city value=""></td>
+<td><span class="text"><?php xl('Address','e'); ?>: </span></td><td><input type=entry size=20 name=street value=""></td>
+<td><span class="text"><?php xl('City','e'); ?>: </span></td><td><input type=entry size=20 name=city value=""></td>
 </tr>
 <tr>
-<td><span class=text><? xl('State','e'); ?>: </span></td><td><input type=entry size=20 name=state value=""></td>
-<td><span class=text><? xl('Zip Code','e'); ?>: </span></td><td><input type=entry size=20 name=postal_code value=""></td>
+<td><span class="text"><?php xl('State','e'); ?>: </span></td><td><input type=entry size=20 name=state value=""></td>
+<td><span class="text"><?php xl('Zip Code','e'); ?>: </span></td><td><input type=entry size=20 name=postal_code value=""></td>
 </tr>
 <tr>
-<td height="22"><span class=text><? xl('Country','e'); ?>: </span></td>
+<td height="22"><span class="text"><?php xl('Country','e'); ?>: </span></td>
 <td><input type=entry size=20 name=country_code value=""></td>
-<td><span class=text><? xl('Federal EIN','e'); ?>: </span></td><td><input type=entry size=20 name=federal_ein value=""></td>
+<td><span class="text"><?php xl('Federal EIN','e'); ?>: </span></td><td><input type=entry size=20 name=federal_ein value=""></td>
 </tr>
 <tr>
 <td>&nbsp;</td><td>&nbsp;</td>
 
-<td><span class=text><? xl('Facility NPI','e'); ?>: </span></td><td><input type=entry size=20 name=facility_npi value=""></td>
+<td><span class="text"><?php xl('Facility NPI','e'); ?>: </span></td><td><input type=entry size=20 name=facility_npi value=""></td>
 
 </tr>
 <tr>
 <td>&nbsp;</td><td>&nbsp;</td>
-<td>&nbsp;</td><td><input type="submit" value=<? xl('Add Facility','e'); ?>></td>
+<td>&nbsp;</td><td><input type="submit" value=<?php xl('Add Facility','e'); ?>></td>
 </tr>
 </table>
 </form>
@@ -191,8 +191,8 @@
 
 <form name='facility' method='post' action="usergroup_admin.php"
  onsubmit='return top.restoreSession()'>
-<input type=hidden name=mode value=<? xl('facility','e'); ?>>
-<span class=bold><? xl('Edit Facilities','e'); ?>: </span>
+<input type=hidden name=mode value=<?php xl('facility','e'); ?>>
+<span class="bold"><?php xl('Edit Facilities','e'); ?>: </span>
 </td><td valign=top>
 <?php
 $fres = 0;
@@ -203,8 +203,8 @@
     $result2[$iter3] = $frow;
   foreach($result2 as $iter3) {
 ?>
-<span class=text><?echo $iter3{name};?></span>
-<a href="facility_admin.php?fid=<?echo $iter3{id};?>" class=link_submit
+<span class="text"><?php echo $iter3{name};?></span>
+<a href="facility_admin.php?fid=<?php echo $iter3{id};?>" class="link_submit"
  onclick="top.restoreSession()">(Edit)</a><br>
 <?php
   }
@@ -217,15 +217,15 @@
 <form name='new_user' method='post' action="usergroup_admin.php"
  onsubmit='return top.restoreSession()'>
 <input type=hidden name=mode value=new_user>
-<span class=bold><? xl('New User','e'); ?>:</span>
+<span class="bold"><?php xl('New User','e'); ?>:</span>
 </td><td>
 <table border=0 cellpadding=0 cellspacing=0>
 <tr>
-<td><span class=text><? xl('Username','e'); ?>: </span></td><td><input type=entry name=username size=20> &nbsp;</td>
-<td><span class=text><? xl('Password','e'); ?>: </span></td><td><input type="password" size=20 name=clearPass></td>
+<td><span class="text"><?php xl('Username','e'); ?>: </span></td><td><input type=entry name=username size=20> &nbsp;</td>
+<td><span class="text"><?php xl('Password','e'); ?>: </span></td><td><input type="password" size=20 name=clearPass></td>
 </tr>
 <tr>
-<td><span class=text><? xl('Groupname','e'); ?>: </span></td><td>
+<td><span class="text"><?php xl('Groupname','e'); ?>: </span></td><td>
 <select name=groupname>
 <?php
 $res = sqlStatement("select distinct name from groups");
@@ -237,15 +237,15 @@
 }
 ?>
 </select></td>
-<td><span class=text><? xl('Authorized','e'); ?>: </span></td><td><input type=checkbox name='authorized' value="1"></td>
+<td><span class="text"><?php xl('Authorized','e'); ?>: </span></td><td><input type=checkbox name='authorized' value="1"></td>
 </tr>
 <tr>
-<td><span class=text><? xl('First Name','e'); ?>: </span></td><td><input type=entry name='fname' size=20></td>
-<td><span class=text><? xl('Middle Name','e'); ?>: </span></td><td><input type=entry name='mname' size=20></td>
+<td><span class="text"><?php xl('First Name','e'); ?>: </span></td><td><input type=entry name='fname' size=20></td>
+<td><span class="text"><?php xl('Middle Name','e'); ?>: </span></td><td><input type=entry name='mname' size=20></td>
 </tr>
 <tr>
-<td><span class=text><? xl('Last Name','e'); ?>: </span></td><td><input type=entry name='lname' size=20></td>
-<td><span class=text><? xl('Default Facility','e'); ?>: </span></td><td><select name=facility>
+<td><span class="text"><?php xl('Last Name','e'); ?>: </span></td><td><input type=entry name='lname' size=20></td>
+<td><span class="text"><?php xl('Default Facility','e'); ?>: </span></td><td><select name=facility>
 <?php
 $fres = sqlStatement("select * from facility order by name");
 if ($fres) {
@@ -253,7 +253,7 @@
     $result[$iter] = $frow;
   foreach($result as $iter) {
 ?>
-<option value="<?echo $iter{name};?>"><?echo $iter{name};?></option>
+<option value="<?php echo $iter{name};?>"><?php echo $iter{name};?></option>
 <?php
   }
 }
@@ -261,12 +261,12 @@
 </select></td>
 </tr>
 <tr>
-<td><span class=text><? xl('Federal Tax ID','e'); ?>: </span></td><td><input type=entry name='federaltaxid' size=20></td>
-<td><span class=text><? xl('Federal Drug ID','e'); ?>: </span></td><td><input type=entry name='federaldrugid' size=20></td>
+<td><span class="text"><?php xl('Federal Tax ID','e'); ?>: </span></td><td><input type=entry name='federaltaxid' size=20></td>
+<td><span class="text"><?php xl('Federal Drug ID','e'); ?>: </span></td><td><input type=entry name='federaldrugid' size=20></td>
 </tr>
 <tr>
-<td><span class="text"><? xl('UPIN','e'); ?>: </span></td><td><input type="entry" name="upin" size="20"></td>
-<td class='text'><? xl('See Authorizations','e'); ?>: </td>
+<td><span class="text"><?php xl('UPIN','e'); ?>: </span></td><td><input type="entry" name="upin" size="20"></td>
+<td class='text'><?php xl('See Authorizations','e'); ?>: </td>
 <td><select name="see_auth">
 <?php
  foreach (array(1 => xl('None'), 2 => xl('Only Mine'), 3 => xl('All')) as $key => $value)
@@ -278,12 +278,12 @@
 </select></td>
 
 <tr>
-<td><span class="text"><? xl('NPI','e'); ?>: </span></td><td><input type="entry" name="npi" size="20"></td>
-<td><span class="text"><? xl('Job Description','e'); ?>: </span></td><td><input type="entry" name="specialty" size="20"></td>
+<td><span class="text"><?php xl('NPI','e'); ?>: </span></td><td><input type="entry" name="npi" size="20"></td>
+<td><span class="text"><?php xl('Job Description','e'); ?>: </span></td><td><input type="entry" name="specialty" size="20"></td>
 </tr>
 <!-- (CHEMED) Calendar UI preference -->
 <tr>
-<td><span class="text"><? xl('Calendar UI','e'); ?>: </span></td><td><select name="cal_ui">
+<td><span class="text"><?php xl('Calendar UI','e'); ?>: </span></td><td><select name="cal_ui">
 <?php
  foreach (array(1 => xl('Default'), 2 => xl('Fancy'), 3 => xl('Outlook')) as $key => $value)
  {
@@ -302,7 +302,7 @@
  if (isset($phpgacl_location) && acl_check('admin', 'acl')) {
 ?>
   <tr>
-  <td class='text'><? xl('Access Control','e'); ?>:</td>
+  <td class='text'><?php xl('Access Control','e'); ?>:</td>
   <td><select name="access_group[]" multiple>
   <?php
    $list_acl_groups = acl_get_group_title_list();
@@ -322,10 +322,10 @@
 ?>
 
 </table>
-<span class=text><? xl('Additional Info','e'); ?>: </span><br>
+<span class="text"><?php xl('Additional Info','e'); ?>: </span><br>
 <textarea name=info cols=40 rows=4 wrap=auto></textarea>
 <br><input type="hidden" name="newauthPass">
-<input type="submit" onClick="javascript:this.form.newauthPass.value=MD5(this.form.clearPass.value);this.form.clearPass.value='';" value=<? xl('Add User','e'); ?>>
+<input type="submit" onClick="javascript:this.form.newauthPass.value=MD5(this.form.clearPass.value);this.form.clearPass.value='';" value=<?php xl('Add User','e'); ?>>
 </form>
 </td>
 
@@ -338,11 +338,11 @@
  onsubmit='return top.restoreSession()'>
 <br>
 <input type=hidden name=mode value=new_group>
-<span class=bold><? xl('New Group','e'); ?>:</span>
+<span class="bold"><?php xl('New Group','e'); ?>:</span>
 </td><td>
-<span class=text><? xl('Groupname','e'); ?>: </span><input type=entry name=groupname size=10>
+<span class="text"><?php xl('Groupname','e'); ?>: </span><input type=entry name=groupname size=10>
 &nbsp;&nbsp;&nbsp;
-<span class=text><? xl('Initial User','e'); ?>: </span>
+<span class="text"><?php xl('Initial User','e'); ?>: </span>
 <select name=username>
 <?php
 $res = sqlStatement("select distinct username from users where username != ''");
@@ -354,7 +354,7 @@
 ?>
 </select>
 &nbsp;&nbsp;&nbsp;
-<input type="submit" value=<? xl('Add Group','e'); ?>>
+<input type="submit" value=<?php xl('Add Group','e'); ?>>
 </form>
 </td>
 
@@ -366,10 +366,10 @@
 <form name='new_group' method='post' action="usergroup_admin.php"
  onsubmit='return top.restoreSession()'>
 <input type=hidden name=mode value=new_group>
-<span class=bold><? xl('Add User To Group','e'); ?>:</span>
+<span class="bold"><?php xl('Add User To Group','e'); ?>:</span>
 </td><td>
-<span class=text>
-<? xl('User','e'); ?>
+<span class="text">
+<?php xl('User','e'); ?>
 : </span>
 <select name=username>
 <?php
@@ -382,7 +382,7 @@
 ?>
 </select>
 &nbsp;&nbsp;&nbsp;
-<span class=text><? xl('Groupname','e'); ?>: </span>
+<span class="text"><?php xl('Groupname','e'); ?>: </span>
 <select name=groupname>
 <?php
 $res = sqlStatement("select distinct name from groups");
@@ -395,7 +395,7 @@
 ?>
 </select>
 &nbsp;&nbsp;&nbsp;
-<input type="submit" value=<? xl('Add User To Group','e'); ?>>
+<input type="submit" value=<?php xl('Add User To Group','e'); ?>>
 </form>
 </td>
 
@@ -406,7 +406,7 @@
 <hr>
 
 <table border=0 cellpadding=1 cellspacing=2>
-<tr><td><span class=bold><? xl('Username','e'); ?></span></td><td><span class=bold><? xl('Real Name','e'); ?></span></td><td><span class=bold><? xl('Info','e'); ?></span></td><td><span class=bold><? xl('Authorized','e'); ?>?</span></td></tr>
+<tr><td><span class="bold"><?php xl('Username','e'); ?></span></td><td><span class="bold"><?php xl('Real Name','e'); ?></span></td><td><span class="bold"><?php xl('Info','e'); ?></span></td><td><span class="bold"><?php xl('Authorized','e'); ?>?</span></td></tr>
 <?php
 $res = sqlStatement("select * from users where username != '' order by username");
 for ($iter = 0;$row = sqlFetchArray($res);$iter++)
@@ -418,12 +418,12 @@
       $iter{"authorized"} = "";
   }
 
-  print "<tr><td><span class=text>" . $iter{"username"} .
+  print "<tr><td><span class='text'>" . $iter{"username"} .
     "</span><a href='user_admin.php?id=" . $iter{"id"} .
     "' class='link_submit' onclick='top.restoreSession()'>(Edit)</a>" .
-    "</td><td><span class=text>" .
-    $iter{"fname"} . ' ' . $iter{"lname"}."</span></td><td><span class=text>" .
-    $iter{"info"} . "</span></td><td align='center'><span class=text>" .
+    "</td><td><span class='text'>" .
+    $iter{"fname"} . ' ' . $iter{"lname"}."</span></td><td><span class='text'>" .
+    $iter{"info"} . "</span></td><td align='center'><span class='text'>" .
     $iter{"authorized"} . "</span></td>";
   print "<td><!--<a href='usergroup_admin.php?mode=delete&id=" . $iter{"id"} .
     "' class='link_submit'>[Delete]</a>--></td>";
@@ -448,7 +448,7 @@
   }
 
   foreach ($grouplist as $groupname => $list) {
-    print "<span class=bold>" . $groupname . "</span><br>\n<span class=text>" .
+    print "<span class='bold'>" . $groupname . "</span><br>\n<span class='text'>" .
       substr($list,0,strlen($list)-2) . "</span><br>\n";
   }
 }

			?
			?
" . $iter{"username"} . + print "
" . $iter{"username"} . "(Edit)" . - "	" . - $iter{"fname"} . ' ' . $iter{"lname"}."	" . - $iter{"info"} . "	" . + "	" . + $iter{"fname"} . ' ' . $iter{"lname"}."	" . + $iter{"info"} . "	" . $iter{"authorized"} . "