diff --git a/server/src/com/cloud/api/BaseCmd.java b/server/src/com/cloud/api/BaseCmd.java
index e1f42327b4c..f5fc17f9ab8 100755
--- a/server/src/com/cloud/api/BaseCmd.java
+++ b/server/src/com/cloud/api/BaseCmd.java
@@ -281,6 +281,7 @@ public abstract class BaseCmd {
         OS_TYPE_ID("ostypeid", BaseCmd.TYPE_LONG, "osTypeId"),
         OS_TYPE_NAME("ostypename", BaseCmd.TYPE_STRING, "osTypeName"),
         OP("op", BaseCmd.TYPE_STRING, "op"),
+        ONE_TO_ONE_NAT("onetoonenat",BaseCmd.TYPE_BOOLEAN,"oneToOneNat"),
         PAGE("page", BaseCmd.TYPE_INT, "page"),
         PAGESIZE("pagesize", BaseCmd.TYPE_INT, "pagesize"),
         PARENT_ID("parentid", BaseCmd.TYPE_LONG, "parentId"),
diff --git a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java
index a4c06429d3a..c4a2da97eae 100644
--- a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java
+++ b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java
@@ -48,7 +48,8 @@ public class AssociateIPAddrCmd extends BaseCmd {
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.DOMAIN_ID, Boolean.FALSE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.USER_ID, Boolean.FALSE));
-        s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.TRUE));
+        s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.TRUE));
+        s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ONE_TO_ONE_NAT, Boolean.FALSE));
     }
 
     public String getName() {
diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp
index 2dc43ed9ed6..2eceeda534e 100644
--- a/ui/new/jsp/account.jsp
+++ b/ui/new/jsp/account.jsp
@@ -24,8 +24,8 @@
     </div> 
     <div id="tab_content_details">
         <div class="grid_actionpanel">
-            <div class="grid_actionbox" id="volume_action_link">
-                <div class="grid_actionsdropdown_box" id="volume_action_menu" style="display: none;">
+            <div class="grid_actionbox" id="action_link">
+                <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
                         <!--  
                     	<li> <a href="#"> Delete </a> </li>
diff --git a/ui/new/jsp/ip_address.jsp b/ui/new/jsp/ip_address.jsp
index 5a0da21199b..ec5a18072e5 100644
--- a/ui/new/jsp/ip_address.jsp
+++ b/ui/new/jsp/ip_address.jsp
@@ -29,8 +29,8 @@
     </div>  
     <div id="tab_content_details">
         <div class="grid_actionpanel">
-            <div class="grid_actionbox" id="volume_action_link">
-                <div class="grid_actionsdropdown_box" id="volume_action_menu" style="display: none;">
+            <div class="grid_actionbox" id="action_link">
+                <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
                         <!--  
                     	<li> <a href="#"> Delete </a> </li>
diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp
index 291b5ee856e..cb730cf7e7b 100644
--- a/ui/new/jsp/iso.jsp
+++ b/ui/new/jsp/iso.jsp
@@ -25,8 +25,8 @@
     </div>
     <div id="tab_content_details">
         <div class="grid_actionpanel">
-            <div class="grid_actionbox" id="volume_action_link">
-                <div class="grid_actionsdropdown_box" id="volume_action_menu" style="display: none;">
+            <div class="grid_actionbox" id="action_link">
+                <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
                         <!--  
                     	<li> <a href="#"> Delete </a> </li>
diff --git a/ui/new/jsp/router.jsp b/ui/new/jsp/router.jsp
index e98941a6530..26433f65969 100644
--- a/ui/new/jsp/router.jsp
+++ b/ui/new/jsp/router.jsp
@@ -27,8 +27,8 @@
     </div> 
     <div id="tab_content_details">
         <div class="grid_actionpanel">
-            <div class="grid_actionbox" id="volume_action_link">
-                <div class="grid_actionsdropdown_box" id="volume_action_menu" style="display: none;">
+            <div class="grid_actionbox" id="action_link">
+                <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
                         <!--  
                     	<li> <a href="#"> Delete </a> </li>
diff --git a/ui/new/jsp/snapshot.jsp b/ui/new/jsp/snapshot.jsp
index a2df6dd9f92..eada1550537 100644
--- a/ui/new/jsp/snapshot.jsp
+++ b/ui/new/jsp/snapshot.jsp
@@ -25,8 +25,8 @@
     </div>    
     <div id="tab_content_details">
         <div class="grid_actionpanel">
-            <div class="grid_actionbox" id="volume_action_link">
-                <div class="grid_actionsdropdown_box" id="volume_action_menu" style="display: none;">
+            <div class="grid_actionbox" id="action_link">
+                <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
                         <!--  
                     	<li> <a href="#"> Delete </a> </li>
diff --git a/ui/new/jsp/volume.jsp b/ui/new/jsp/volume.jsp
index 89a48705355..179a6f4052d 100644
--- a/ui/new/jsp/volume.jsp
+++ b/ui/new/jsp/volume.jsp
@@ -28,8 +28,8 @@
     <!--Details tab (start)-->
     <div id="tab_content_details">
         <div class="grid_actionpanel">
-            <div class="grid_actionbox" id="volume_action_link">
-                <div class="grid_actionsdropdown_box" id="volume_action_menu" style="display: none;">
+            <div class="grid_actionbox" id="action_link">
+                <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
                         <!--  
                     	<li> <a href="#"> Delete </a> </li>
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index 65c79f3e321..15a98784438 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -30,7 +30,13 @@ $(document).ready(function() {
             clearMidMenu();
             
             $("#right_panel").load(rightPanelJSP, function(){   
-                afterLoadRightPanelJSP();                
+                
+                $("#right_panel_content #tab_content_details #action_message_box #close_button").bind("click", function(event){    
+                    $(this).parent().hide();
+                    return false;
+                });                
+                afterLoadRightPanelJSP();    
+                            
                 $.ajax({
 	                cache: false,
 	                data: createURL("command="+commandString+"&pagesize="+midmenuItemCount),
diff --git a/ui/new/scripts/cloud.core2.router.js b/ui/new/scripts/cloud.core2.router.js
index 42b3d836f10..e04d7af5dce 100644
--- a/ui/new/scripts/cloud.core2.router.js
+++ b/ui/new/scripts/cloud.core2.router.js
@@ -1,5 +1,10 @@
 function afterLoadRouterJSP() {
+    
+}
 
+function routerAfterDetailsTabAction(jsonObj) {
+    $("#midmenuItem_"+jsonObj.id).data("jsonObj", jsonObj);   
+    routerJsonToDetailsTab(jsonObj);   
 }
 
 function routerToMidmenu(jsonObj, $midmenuItem1) {
@@ -17,17 +22,74 @@ function routerToMidmenu(jsonObj, $midmenuItem1) {
 
 function routerToRigntPanel($midmenuItem) {      
     var jsonObj = $midmenuItem.data("jsonObj");
+    routerJsonToDetailsTab(jsonObj);   
+}
+
+function routerJsonToDetailsTab(jsonObj) {    
+    var $detailsTab = $("#right_panel_content #tab_content_details");    
+    $detailsTab.data("jsonObj", jsonObj);     
+    $detailsTab.find("#state").text(fromdb(jsonObj.state));
+    $detailsTab.find("#zonename").text(fromdb(jsonObj.zonename));
+    $detailsTab.find("#name").text(fromdb(jsonObj.name));
+    $detailsTab.find("#publicip").text(fromdb(jsonObj.publicip));
+    $detailsTab.find("#privateip").text(fromdb(jsonObj.privateip));
+    $detailsTab.find("#guestipaddress").text(fromdb(jsonObj.guestipaddress));
+    $detailsTab.find("#hostname").text(fromdb(jsonObj.hostname));
+    $detailsTab.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
+    $detailsTab.find("#account").text(fromdb(jsonObj.account));  
+    setDateField(jsonObj.created, $detailsTab.find("#created"));	  
     
-    var $rightPanelContent = $("#right_panel_content");
+    var $actionLink = $detailsTab.find("#action_link");
+	$actionLink.bind("mouseover", function(event) {	    
+        $(this).find("#action_menu").show();    
+        return false;
+    });
+    $actionLink.bind("mouseout", function(event) {       
+        $(this).find("#action_menu").hide();    
+        return false;
+    });			
+        
+    var $actionMenu = $actionLink.find("#action_menu");
+    $actionMenu.find("#action_list").empty();
     
-    $rightPanelContent.find("#state").text(fromdb(jsonObj.state));
-    $rightPanelContent.find("#zonename").text(fromdb(jsonObj.zonename));
-    $rightPanelContent.find("#name").text(fromdb(jsonObj.name));
-    $rightPanelContent.find("#publicip").text(fromdb(jsonObj.publicip));
-    $rightPanelContent.find("#privateip").text(fromdb(jsonObj.privateip));
-    $rightPanelContent.find("#guestipaddress").text(fromdb(jsonObj.guestipaddress));
-    $rightPanelContent.find("#hostname").text(fromdb(jsonObj.hostname));
-    $rightPanelContent.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
-    $rightPanelContent.find("#account").text(fromdb(jsonObj.account));  
-    setDateField(jsonObj.created, $rightPanelContent.find("#created"));	    
-}
\ No newline at end of file
+    if (jsonObj.state == 'Running') {
+        //template.find(".grid_links").find("#router_action_stop_container, #router_action_reboot_container, #router_action_view_console_container").show();	
+        buildActionLinkForDetailsTab("Stop Router", routerActionMap, $actionMenu, routerListAPIMap);	
+        buildActionLinkForDetailsTab("Reboot Router", routerActionMap, $actionMenu, routerListAPIMap);	
+        //buildActionLinkForDetailsTab("View Console", routerActionMap, $actionMenu, routerListAPIMap);	
+    }
+    else if (jsonObj.state == 'Stopped') {
+        //template.find(".grid_links").find("#router_action_start_container").show();
+        buildActionLinkForDetailsTab("Start Router", routerActionMap, $actionMenu, routerListAPIMap);	
+    }   
+}
+
+var routerListAPIMap = {
+    listAPI: "listRouters",
+    listAPIResponse: "listroutersresponse",
+    listAPIResponseObj: "router"
+};           
+  
+var routerActionMap = {  
+    "Stop Router": {
+        api: "stopRouter",            
+        isAsyncJob: true,
+        asyncJobResponse: "stoprouterresponse",
+        inProcessText: "Stopping Router....",
+        afterActionSeccessFn: routerAfterDetailsTabAction
+    },
+    "Start Router": {
+        api: "startRouter",            
+        isAsyncJob: true,
+        asyncJobResponse: "startrouterresponse",
+        inProcessText: "Starting Router....",
+        afterActionSeccessFn: routerAfterDetailsTabAction
+    },
+    "Reboot Router": {
+        api: "rebootRouter",           
+        isAsyncJob: true,
+        asyncJobResponse: "rebootrouterresponse",
+        inProcessText: "Rebooting Router....",
+        afterActionSeccessFn: routerAfterDetailsTabAction
+    }
+}   
\ No newline at end of file
diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js
index 8920c3e6003..dd547bd4baf 100644
--- a/ui/new/scripts/cloud.core2.volume.js
+++ b/ui/new/scripts/cloud.core2.volume.js
@@ -19,12 +19,7 @@ function afterLoadVolumeJSP() {
 			    }
 		    }	
 	    }
-    });       
- 
-    $("#right_panel_content #tab_content_details #action_message_box #close_button").bind("click", function(event){    
-        $(this).parent().hide();
-        return false;
-    });
+    });    
 }
 
 function volumeAfterDetailsTabAction(jsonObj) {
@@ -69,17 +64,17 @@ function volumeJsonToDetailsTab(jsonObj){
 		
     setDateField(jsonObj.created, $detailsTab.find("#created"));	
     
-    var $actionLink = $detailsTab.find("#volume_action_link");
+    var $actionLink = $detailsTab.find("#action_link");
 	$actionLink.bind("mouseover", function(event) {	    
-        $(this).find("#volume_action_menu").show();    
+        $(this).find("#action_menu").show();    
         return false;
     });
     $actionLink.bind("mouseout", function(event) {       
-        $(this).find("#volume_action_menu").hide();    
+        $(this).find("#action_menu").hide();    
         return false;
     });			
         
-    var $actionMenu = $actionLink.find("#volume_action_menu");
+    var $actionMenu = $actionLink.find("#action_menu");
     $actionMenu.find("#action_list").empty();
     if(jsonObj.type=="ROOT") { //"create template" is allowed(when stopped), "detach disk" is disallowed.
 		if (jsonObj.vmstate == "Stopped")