diff --git a/lib/admin/Controller/peering.pm b/lib/admin/Controller/peering.pm
index 0554e5e..ea7ad56 100644
--- a/lib/admin/Controller/peering.pm
+++ b/lib/admin/Controller/peering.pm
@@ -364,7 +364,6 @@ sub create_peer : Local {
 
     my $grpid = $c->request->params->{grpid};
     my $name = $c->request->params->{name};
-    my $domain = $c->request->params->{domain};
     my $ip = $c->request->params->{ip};
     my $port = $c->request->params->{port};
     my $weight = $c->request->params->{weight};
@@ -380,7 +379,6 @@ sub create_peer : Local {
                                                  { group_id => $grpid,
                                                    data => {
                                                        name => $name,
-                                                       domain => $domain,
                                                        ip => $ip,
                                                        port => $port,
                                                        weight => $weight,
@@ -464,7 +462,6 @@ sub edit_peer : Local {
     my $grpid = $c->request->params->{grpid};
     my $peerid = $c->request->params->{peerid};
     my $name = $c->request->params->{name};
-    my $domain = $c->request->params->{domain};
     my $ip = $c->request->params->{ip};
     my $port = $c->request->params->{port};
     my $weight = $c->request->params->{weight};
@@ -477,7 +474,6 @@ sub edit_peer : Local {
                                                  { id => $peerid,
                                                    data => {
                                                        name => $name,
-                                                       domain => $domain,
                                                        ip => $ip,
                                                        port => $port,
                                                        weight => $weight,
diff --git a/root/css/admin.css b/root/css/admin.css
index a3441c9..67c1f20 100644
--- a/root/css/admin.css
+++ b/root/css/admin.css
@@ -416,6 +416,9 @@ ul#topsubmenu {
 #contentplace .registered_contacts,
 #contentplace .billing_fees,
 #contentplace .billing_peaktimes,
+#contentplace .peering_rules,
+#contentplace .peering_servers,
+#contentplace .peering_rw_rules,
 #contentplace .numberblocks
 {
 	width: 100%;
diff --git a/root/tt/peering_detail.tt b/root/tt/peering_detail.tt
index 557d58d..bfba904 100644
--- a/root/tt/peering_detail.tt
+++ b/root/tt/peering_detail.tt
@@ -3,15 +3,15 @@
             [% grp.group.name %]</a>
         </h2>
 
-		<a href="/peering" class="aaction">back</a>
+        <a href="/peering" class="aaction">back</a>
 
-		<h3>Peering Rules</h3>
+        <h3>Peering Rules</h3>
 
         <div class="p1">
           [% IF messages.erulmsg %]<div class="goodmsg">[% messages.erulmsg %]</div>[% END %]
           [% IF messages.erulerr %]<div class="errormsg">[% messages.erulerr %]</div>[% END %]
 
-          <table class="domains">
+          <table class="peering_rules">
             <tr class="table_header">
               <td>Callee Prefix</td>
               <td>Caller Pattern</td>
@@ -66,13 +66,13 @@
                       </div>
                     [% END %]
                   </td>
-				[% END %]  
+                [% END %]  
                 </form>
               </tr>
             [% id = id + 1 %]
             [% END %]
             [% UNLESS Catalyst.session.admin.read_only %]
-			<tr>
+            <tr>
                   <form action="/peering/create_rule" method="post">
                     <input type="hidden" name="grpid" value="[% grp.group.id %]" />
                     <td>
@@ -88,31 +88,30 @@
                              name="description" value="" />
                     </td>
                     <td>
-                  		<div class="postlink">
-                    		<label for="radd">add</label>
-                    		<input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="radd" />
-                  		</div>
+                          <div class="postlink">
+                            <label for="radd">add</label>
+                            <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="radd" />
+                          </div>
                   </form>
                     </td>
-					<td />
-			</tr>
-			[% END %]
+                    <td />
+            </tr>
+            [% END %]
 
 
 
           </table>
         </div>
 
-		<h3>Peering Servers</h3>
+        <h3>Peering Servers</h3>
 
         <div class="p1">
           [% IF messages.servmsg %]<div class="goodmsg">[% messages.servmsg %]</div>[% END %]
           [% IF messages.serverr %]<div class="errormsg">[% messages.serverr %]</div>[% END %]
 
-          <table class="domains">
+          <table class="peering_servers">
             <tr class="table_header">
               <td>Name</td>
-              <td>From-Domain</td>
               <td>IP Address</td>
               <td>Port</td>
               <td>Weight</td>
@@ -130,10 +129,6 @@
                       <input type="text" size="15 id="addtxt" title="string, peer name"
                              name="name" value="[% peer.name %]" />
                     </td>
-                    <td>
-                      <input type="text" size="15 id="addtxt" title="string, peer domain"
-                             name="domain" value="[% peer.domain %]" />
-                    </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, peer ip address"
                              name="ip" value="[% peer.ip %]" />
@@ -156,7 +151,6 @@
                   <td><a href="/peering/detail?group_id=[% grp.group.id %]" class="aaction">cancel</a></td>
                 [% ELSE %]
                   <td><a href="/peering/rewrite?peer_id=[% peer.id%]" class="aaction">[% peer.name %]</a></td>
-                  <td>[% peer.domain %]</td>
                   <td>[% peer.ip %]</td>
                   <td>[% peer.port %]</td>
                   <td>[% peer.weight %]</td>
@@ -176,23 +170,19 @@
                       </div>
                     [% END %]
                   </td>
-				[% END %]  
+                [% END %]  
                 </form>
               </tr>
             [% id = id + 1 %]
             [% END %]
             [% UNLESS Catalyst.session.admin.read_only %]
-			<tr>
+            <tr>
                   <form action="/peering/create_peer" method="post">
                     <input type="hidden" name="grpid" value="[% grp.group.id %]" />
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, peer name"
                              name="name" value="" />
                     </td>
-                    <td>
-                      <input type="text" size="15" id="addtxt" title="string, peer domain"
-                             name="domain" value="" />
-                    </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, peer ip address"
                              name="ip" value="" />
@@ -206,14 +196,14 @@
                              name="weight" value="1" />
                     </td>
                     <td>
-                  		<div class="postlink">
-                    		<label for="padd">add</label>
-                    		<input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="padd" />
-                  		</div>
+                          <div class="postlink">
+                            <label for="padd">add</label>
+                            <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="padd" />
+                          </div>
                   </form>
                     </td>
-					<td />
-			</tr>
+                    <td />
+            </tr>
             [% END %]
           </table>
         </div>
diff --git a/root/tt/peering_rewrite.tt b/root/tt/peering_rewrite.tt
index 89b3fe7..0c7296d 100644
--- a/root/tt/peering_rewrite.tt
+++ b/root/tt/peering_rewrite.tt
@@ -3,55 +3,55 @@
             [% peer.peer_host.name %]</a>
         </h2>
 
-		<a href="detail?group_id=[% peer.peer_host.group_id %]" class="aaction">back</a>
+        <a href="detail?group_id=[% peer.peer_host.group_id %]" class="aaction">back</a>
 
-		[% IF all_peers.size > 0 %]	
+        [% IF all_peers.size > 0 %]    
         [% UNLESS Catalyst.session.admin.read_only %]
-		<h3>Import Rewrite Rules from another host</h3>
+        <h3>Import Rewrite Rules from another host</h3>
         <div class="p1">
           [% IF messages.cpmsg %]<div class="goodmsg">[% messages.cpmsg %]</div>[% END %]
           [% IF messages.cperr %]<div class="errormsg">[% messages.cperr %]</div>[% END %]
-			<table class="domains">
-			<tr>
+            <table class="peering_rw_rules">
+            <tr>
             <form action="/peering/copy_rewrite" method="post">
                 <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                 <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
-				<td>
-				Copy rules from peering host 
-            	<select title="string, peering host" size="1" name="rpeerid">
-            		[% FOREACH cpeer = all_peers %]
-						<option value="[% cpeer.id %]">[% cpeer.name %]</option>
-					[% END %]
-				</select>
-				and
-            	<select title="string, copy policy" size="1" name="policy">
-					<option selected>keep</option>
-					<option>delete</option>
-				</select>
-				existing rewrite rules.
-				</td>
-				<td style="width:40px;">
+                <td>
+                Copy rules from peering host 
+                <select title="string, peering host" size="1" name="rpeerid">
+                    [% FOREACH cpeer = all_peers %]
+                        <option value="[% cpeer.id %]">[% cpeer.name %]</option>
+                    [% END %]
+                </select>
+                and
+                <select title="string, copy policy" size="1" name="policy">
+                    <option selected>keep</option>
+                    <option>delete</option>
+                </select>
+                existing rewrite rules.
+                </td>
+                <td style="width:40px;">
                 <div class="postlink">
-                	<label for="cpapply">apply</label>
+                    <label for="cpapply">apply</label>
                    <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="cpapply" />
                   </div>
-				</td>
-              	<td style="width:60px;" />
-			</form>
-			</tr>
-			</table>
-		</div>
-		[% END %]
-		[% END %]
+                </td>
+                  <td style="width:60px;" />
+            </form>
+            </tr>
+            </table>
+        </div>
+        [% END %]
+        [% END %]
 
 
-		<h3 id="icaller">Inbound Rewrite Rules for Caller</h3>
+        <h3 id="icaller">Inbound Rewrite Rules for Caller</h3>
 
         <div class="p1">
           [% IF messages.icallermsg %]<div class="goodmsg">[% messages.icallermsg %]</div>[% END %]
           [% IF messages.icallererr %]<div class="errormsg">[% messages.icallererr %]</div>[% END %]
 
-          <table class="domains">
+          <table class="peering_rw_rules">
             <tr class="table_header">
               <td>Match Pattern</td>
               <td>Replacement Pattern</td>
@@ -116,12 +116,12 @@
                       </div>
                     [% END %]
                   </td>
-				[% END %]  
+                [% END %]  
                 </form>
               </tr>
             [% id = id + 1 %]
             [% END %]
-			<tr>
+            <tr>
             [% UNLESS Catalyst.session.admin.read_only %]
                   <form action="/peering/create_rewrite" method="post">
                     <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
@@ -145,14 +145,14 @@
                              name="description" value="" />
                     </td>
                     <td>
-                  		<div class="postlink">
-                    		<label for="radd">add</label>
-                    		<input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="radd" />
-                  		</div>
+                          <div class="postlink">
+                            <label for="radd">add</label>
+                            <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="radd" />
+                          </div>
                   </form>
                     </td>
-					<td />
-			</tr>
+                    <td />
+            </tr>
             [% END %]
 
 
@@ -160,13 +160,13 @@
           </table>
         </div>
 
-		<h3 id="icallee">Inbound Rewrite Rules for Callee</h3>
+        <h3 id="icallee">Inbound Rewrite Rules for Callee</h3>
 
         <div class="p1">
           [% IF messages.icalleemsg %]<div class="goodmsg">[% messages.icalleemsg %]</div>[% END %]
           [% IF messages.icalleeerr %]<div class="errormsg">[% messages.icalleeerr %]</div>[% END %]
 
-          <table class="domains">
+          <table class="peering_rw_rules">
             <tr class="table_header">
               <td>Match Pattern</td>
               <td>Replacement Pattern</td>
@@ -231,13 +231,13 @@
                       </div>
                     [% END %]
                   </td>
-				[% END %]  
+                [% END %]  
                 </form>
               </tr>
             [% id = id + 1 %]
             [% END %]
             [% UNLESS Catalyst.session.admin.read_only %]
-			<tr>
+            <tr>
                   <form action="/peering/create_rewrite" method="post">
                     <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
                     <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
@@ -260,27 +260,27 @@
                              name="description" value="" />
                     </td>
                     <td>
-                  		<div class="postlink">
-                    		<label for="itadd">add</label>
-                    		<input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="itadd" />
-                  		</div>
+                          <div class="postlink">
+                            <label for="itadd">add</label>
+                            <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="itadd" />
+                          </div>
                   </form>
                     </td>
-					<td />
-			</tr>
-			[% END %]
+                    <td />
+            </tr>
+            [% END %]
 
 
           </table>
         </div>
 
-		<h3 id="ocaller">Outbound Rewrite Rules for Caller</h3>
+        <h3 id="ocaller">Outbound Rewrite Rules for Caller</h3>
 
         <div class="p1">
           [% IF messages.ocallermsg %]<div class="goodmsg">[% messages.ocallermsg %]</div>[% END %]
           [% IF messages.ocallererr %]<div class="errormsg">[% messages.ocallererr %]</div>[% END %]
 
-          <table class="domains">
+          <table class="peering_rw_rules">
             <tr class="table_header">
               <td>Match Pattern</td>
               <td>Replacement Pattern</td>
@@ -345,13 +345,13 @@
                       </div>
                     [% END %]
                   </td>
-				[% END %]  
+                [% END %]  
                 </form>
               </tr>
             [% id = id + 1 %]
             [% END %]
             [% UNLESS Catalyst.session.admin.read_only %]
-			<tr>
+            <tr>
                   <form action="/peering/create_rewrite" method="post">
                     <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
                     <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
@@ -374,27 +374,27 @@
                              name="description" value="" />
                     </td>
                     <td>
-                  		<div class="postlink">
-                    		<label for="ofadd">add</label>
-                    		<input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="ofadd" />
-                  		</div>
+                          <div class="postlink">
+                            <label for="ofadd">add</label>
+                            <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="ofadd" />
+                          </div>
                   </form>
                     </td>
-					<td />
-			</tr>
-			[% END %]
+                    <td />
+            </tr>
+            [% END %]
 
 
           </table>
         </div>
 
-		<h3 id="ocallee">Outbound Rewrite Rules for Callee</h3>
+        <h3 id="ocallee">Outbound Rewrite Rules for Callee</h3>
 
         <div class="p1">
           [% IF messages.ocalleemsg %]<div class="goodmsg">[% messages.ocalleemsg %]</div>[% END %]
           [% IF messages.ocalleeerr %]<div class="errormsg">[% messages.ocalleeerr %]</div>[% END %]
 
-          <table class="domains">
+          <table class="peering_rw_rules">
             <tr class="table_header">
               <td>Match Pattern</td>
               <td>Replacement Pattern</td>
@@ -459,13 +459,13 @@
                       </div>
                     [% END %]
                   </td>
-				[% END %]  
+                [% END %]  
                 </form>
               </tr>
             [% id = id + 1 %]
             [% END %]
             [% UNLESS Catalyst.session.admin.read_only %]
-			<tr>
+            <tr>
                   <form action="/peering/create_rewrite" method="post">
                     <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
                     <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
@@ -488,15 +488,15 @@
                              name="description" value="" />
                     </td>
                     <td>
-                  		<div class="postlink">
-                    		<label for="otadd">add</label>
-                    		<input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="otadd" />
-                  		</div>
+                          <div class="postlink">
+                            <label for="otadd">add</label>
+                            <input type="image" class="hidden" src="/static/images/dot_trans.gif" alt="" id="otadd" />
+                          </div>
                   </form>
                     </td>
-					<td />
-			</tr>
-			[% END %]
+                    <td />
+            </tr>
+            [% END %]