diff --git a/modules/iaas/modules/aws_cloud/includes/aws_cloud_security_groups_ui.inc b/modules/iaas/modules/aws_cloud/includes/aws_cloud_security_groups_ui.inc
index 707f8ef..fbf529a 100644
--- a/modules/iaas/modules/aws_cloud/includes/aws_cloud_security_groups_ui.inc
+++ b/modules/iaas/modules/aws_cloud/includes/aws_cloud_security_groups_ui.inc
@@ -525,6 +525,7 @@ function aws_cloud_display_security_group_submit($form_id, &$form_state) {
   
   if ($form_values['operation_type'] == 'AddIPs_TCP_Button') {
     // User Activity Log
+    
     cloud_audit_user_activity( 
       array(
         'type' => 'user_activity',
@@ -533,6 +534,7 @@ function aws_cloud_display_security_group_submit($form_id, &$form_state) {
       )
     );
     $result = aws_cloud_authorize_security_group($cloud_context, $form_values['group_name'], '', '', $form_values['protocol'], $form_values['tcp_Ports_start'], $form_values['tcp_Ports_end'], $form_values['tcp_IPs']);
+
   }
   elseif ($form_values['operation_type'] == 'AddIPs_ICMP_Button') {
     // User Activity Log
@@ -546,8 +548,8 @@ function aws_cloud_display_security_group_submit($form_id, &$form_state) {
 
     $result = aws_cloud_authorize_security_group($cloud_context, $form_values['group_name'], '', '', 'icmp', $form_values['icmp_Ports_start'], $form_values['icmp_Ports_end'], $form_values['icmp_IPs']);
   }
-  elseif ($form_values['operation_type'] == 'Add_Grp_Button') {
-    $result = aws_cloud_authorize_security_group($cloud_context, $form_values['group_name'], $form_values['grp'], $form_values['grp_owner']);
+  elseif ($form_values['operation_type'] == 'Add_Grp_Button') { // Takes the values (IP & Port Range) from the AddIPs_TCP
+    $result = aws_cloud_authorize_security_group($cloud_context, $form_values['group_name'], $form_values['grp'], $form_values['grp_owner'], $form_values['protocol'], $form_values['tcp_Ports_start'], $form_values['tcp_Ports_end'], $form_values['tcp_IPs']);
   }
   elseif ($form_values['op'] == t('List Security Groups')) {
     $form_state['redirect'] = $cloud_menu_path . '/security_groups';
@@ -960,19 +962,18 @@ function theme_aws_cloud_display_security_group_list($form) {
  */
 function aws_cloud_get_security_action($cloud_context, $security_info) {
   $cloud_menu_path = cloud_get_menu_path($cloud_context);
-  $action_data = array();
+  $action_data = '';
   $prop['onclick'] = cloud_get_messagebox('Are you sure you want to delete the Security Group "' . $security_info['group_name'] . '" ?');
   if (user_access($cloud_context . ' delete security group') ) {
-    $action_data[] = cloud_display_action('images/icon_delete.png', t('Delete'), $cloud_menu_path . '/security_groups/delete', array('query' => array('sg_name' => $security_info['group_name']), 'html' => TRUE), $prop['onclick']);
+    $action_data = cloud_display_action('images/icon_delete.png', t('Delete'), $cloud_menu_path . '/security_groups/delete', array('query' => array('sg_name' => $security_info['group_name']), 'html' => TRUE), $prop['onclick']);
   }
   
   if (user_access($cloud_context . ' setup security group') ) {
-    $action_data[] = cloud_display_action('images/icon_edit.png', t('Edit'), $cloud_menu_path . '/security_groups/describe', array('query' => array('group_name' => $security_info['group_name']), 'html' => TRUE));
+    $action_data .= cloud_display_action('images/icon_edit.png', t('Edit'), $cloud_menu_path . '/security_groups/describe', array('query' => array('group_name' => $security_info['group_name']), 'html' => TRUE));
   }
   
-  $user_actions = module_invoke_all('aws_cloud_security_action_data', $security_info);
-  $action_data = array_merge($action_data, $user_actions);
-  return implode($action_data);
+  // @todo Add hook
+  return $action_data;
 }