% if ( $location->county ) {
(<% $location->county |h %> county)\
% }
-,<% state_label( $location->state, $location->country ) |h %>
+<% ($location->city || $location->county) ? ', ' : ''%><% state_label( $location->state, $location->country ) |h %>
<% $location->zip %>
</TD>
</TR>
% foreach my $phone (qw(daytime night mobile)) {
% next if !$cust_main->get($phone);
<TR>
- <TD ALIGN="right"><% $phone_label{$phone} %></TD>
+ <TH ALIGN="right"><% $phone_label{$phone} %></TD>
<TD COLSPAN=3>
<& /elements/phonenumber.html,
$cust_main->get($phone),