diff --git a/pandora_console/extensions/system_info.php b/pandora_console/extensions/system_info.php
index 07c4570dd0..a6248a54d3 100644
--- a/pandora_console/extensions/system_info.php
+++ b/pandora_console/extensions/system_info.php
@@ -421,7 +421,7 @@ function mainSystemInfo() {
 	$table->width = '100%';
 	$table->class = 'databox filters';
 	$table->align = array();
-	$table->align[1] = 'right';
+	
 	if ($pandora_diag) {
 		$table->data[0][0] = '<a href="#diag_info">' .
 			__('Pandora Diagnostic info') . "</a>";
@@ -429,23 +429,24 @@ function mainSystemInfo() {
 	else {
 		$table->data[0][0] = __('Pandora Diagnostic info');
 	}
-	$table->data[0][1] = html_print_checkbox('pandora_diag', 1, $pandora_diag, true);
+	$table->data[0][0] .= html_print_checkbox('pandora_diag', 1, $pandora_diag, true);
 	if ($system_info) {
-		$table->data[1][0] = '<a href="#system_info">' . __('System info') . '</a>';
+		$table->data[0][2] = '<a href="#system_info">' . __('System info') . '</a>';
 	}
 	else {
-		$table->data[1][0] = __('System info');
+		$table->data[0][2] = __('System info');
 	}
-	$table->data[1][1] = html_print_checkbox('system_info', 1, $system_info, true);
+	$table->data[0][2] .= html_print_checkbox('system_info', 1, $system_info, true);
+	
 	if ($log_info) {
-		$table->data[2][0] = '<a href="#log_info">' . __('Log Info') . '</a>';
+		$table->data[0][3] = '<a href="#log_info">' . __('Log Info') . '</a>';
 	}
 	else {
-		$table->data[2][0] = __('Log Info');
+		$table->data[0][3] = __('Log Info');
 	}
-	$table->data[2][1] = html_print_checkbox('log_info', 1, $log_info, true);
-	$table->data[3][0] = __('Number lines of log');
-	$table->data[3][1] = html_print_input_text('log_num_lines', $log_num_lines, __('Number lines of log'), 5, 10, true);
+	$table->data[0][3] .= html_print_checkbox('log_info', 1, $log_info, true);
+	$table->data[0][4] = __('Number lines of log');
+	$table->data[0][4] .= html_print_input_text('log_num_lines', $log_num_lines, __('Number lines of log'), 5, 10, true);
 	
 
 	$default_location = $config['attachment_store'] . '/last_info.zip';
diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php
index 26b0c7ff52..3a5da58aee 100755
--- a/pandora_console/godmode/category/category.php
+++ b/pandora_console/godmode/category/category.php
@@ -136,9 +136,7 @@ if (!empty($result)) {
 	html_print_table ($table);
 	
 	if (defined('METACONSOLE')) {
-		echo "<table border=0 cellpadding=0 cellspacing=0 class='' width=100%>";
-		echo "<tr>";
-		echo "<td align=right>";
+		echo "<div style='width=100%; float:right;'>";
 			if(defined('METACONSOLE'))
 				echo '<form method="post" action="index.php?sec=advanced&sec2=godmode/category/edit_category&action=new&pure='.(int)$config['pure'].'">';
 			else
@@ -146,9 +144,7 @@ if (!empty($result)) {
 			html_print_input_hidden ("create_category", "1", true);
 			html_print_submit_button (__('Create category'), 'create_button', false, 'class="sub next"');
 			echo "</form>";
-		echo "</td>";
-		echo "</tr>";
-		echo "</table>";
+		echo "</div>";
 	}
 }
 else {
@@ -157,17 +153,13 @@ else {
 }
 // Form to add new categories or search categories
 if (!defined('METACONSOLE')) {
-	echo "<table border=0 cellpadding=4 cellspacing=4 class='' width=100%>";
-	echo "<tr>";
-	echo "<td align=right>";
+	echo "<div style='width=100%; float:right;'>";
 		echo '<form method="post" action="index.php?sec=gmodules&sec2=godmode/category/edit_category&action=new&pure='.(int)$config['pure'].'">';
 		html_print_input_hidden ("create_category", "1", true);
 		html_print_submit_button (__('Create category'),
 			'create_button', false, 'class="sub next"');
 		echo "</form>";
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
+	echo "</div>";
 }
 enterprise_hook('close_meta_frame');
 
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 4b8950bf8c..c437304e3d 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -332,6 +332,8 @@ if (!empty($groups)) {
 	$table->align = array ();
 	$table->align[2] = 'left';
 	$table->align[5] = 'left';
+	$table->size[4] = '30%';
+	$table->size[5] = '10%';
 	$table->data = array ();
 	
 	$offset = (int)get_parameter('offset', 0);
diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index 925af86052..f784e5bb4d 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.php
@@ -199,7 +199,7 @@ $table->align = array ();
 $table->align[1] = 'left';
 $table->size = array ();
 $table->size[0] = '80%';
-$table->size[1] = '50px';
+$table->size[1] = '10%';
 $table->data = array ();
 
 $total_groups = db_get_all_rows_filter ('tnetwork_component_group', false, 'COUNT(*) AS total');
diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php
index 760ca73f96..f3ffc36bcc 100644
--- a/pandora_console/godmode/netflow/nf_edit.php
+++ b/pandora_console/godmode/netflow/nf_edit.php
@@ -152,7 +152,7 @@ if (isset($data)) {
 	echo "<form method='post' action='" . $config['homeurl'] . "index.php?sec=netf&sec2=godmode/netflow/nf_edit&pure=$pure'>";
 	html_print_input_hidden('multiple_delete', 1);
 	html_print_table ($table);
-	echo "<div style=' text-align: right; width:" . $table->width . "'>";
+	echo "<div style=' float: right;'>";
 
 	html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
 	echo "</div>";
@@ -163,7 +163,7 @@ else {
 }
 
 echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form&pure='.$pure.'">';
-echo "<div style='padding-top: 20px; text-align: right; width:" . $table->width . "'>";
+echo "<div style='margin-right: 5px; float: right;'>";
 html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"');
 echo "</div>";
 echo "</form>";
diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php
index 6c3cf632a3..6662a69a3e 100644
--- a/pandora_console/godmode/reporting/graphs.php
+++ b/pandora_console/godmode/reporting/graphs.php
@@ -181,25 +181,35 @@ if (!empty ($graphs)) {
 		array_push ($table->data, $data);
 	}
 	
-	echo "<form method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graphs'>";
-	html_print_input_hidden('multiple_delete', 1);
 	html_print_table ($table);
-	echo "<div style='padding-bottom: 20px; text-align: right; width:" . $table->width . "'>";
-	html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
-	echo "</div>";
-	echo "</form>";
 }
 else {
-	echo "<div class='nf'>".__('There are no defined graphs')."</div>";
+	ui_print_info_message ( array('no_close'=>true, 'message'=>  __('There are no defined graphs.') ) );
 }
 
-if (check_acl ($config['id_user'], 0, "RW")) {
-	echo '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/graph_builder">';
-	echo '<div class="action-buttons" style="width: 100%;">';
-	html_print_submit_button (__('Create graph'), 'create', false, 'class="sub next"');
-	echo "</div>";
-	echo "</form>";
-}
+echo "<table width='100%'>";
+	echo "<tr>";
+		echo "<td>";
+			echo "<div style='float: right;'>";
+				if (!empty($graphs)){
+					echo "<form method='post' style='float:right;' action='index.php?sec=reporting&sec2=godmode/reporting/graphs'>";
+						html_print_input_hidden('multiple_delete', 1);
+						html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
+					echo "</form>";
+				}
+				if (check_acl ($config['id_user'], 0, "RW")) {
+					echo '<form method="post" style="float:right;" action="index.php?sec=reporting&sec2=godmode/reporting/graph_builder">';
+						html_print_submit_button (__('Create graph'), 'create', false, 'class="sub next" style="margin-right:5px;"');
+					echo "</form>";
+				}
+			echo "</div>";
+		echo "</td>";
+	echo "</tr>";
+echo "</table>";
+
+
+
+
 ?>
 
 <script type="text/javascript">
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 496def604e..e74b6c1c04 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -520,9 +520,9 @@ switch ($action) {
 						__('Op.') . '</span>';
 					
 				//$table->size = array ();
-				$table->size[$next] = '5%';
-				$table->align[$next] = 'center';
-				$table->headstyle[$next] = 'text-align:center;';
+				$table->size[$next] = '10%';
+				$table->align[$next] = 'left';
+				$table->headstyle[$next] = 'text-align:left;';
 			
 			}
 			
diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php
index f06c355e2c..3fc1809f7c 100644
--- a/pandora_console/godmode/tag/tag.php
+++ b/pandora_console/godmode/tag/tag.php
@@ -120,25 +120,19 @@ else {
 // Form to add new tags or search tags
 if (!defined('METACONSOLE')) {
 	echo "<table border=0 cellpadding=4 cellspacing=4 class='databox data' width=100%>";
-	echo "<tr>";
-	echo "<td>";
-		echo '<b>' . __("Name") . "/" . __("Description") . '</b>';
-	echo "</td>";
-	echo "<td align=center>";
-		echo '<form method=post action="index.php?sec='.$sec.'&sec2=godmode/tag/tag&delete_tag=0">';
-		html_print_input_hidden ("search_tag", "1");
-		html_print_input_text ('tag_name', $tag_name, '', 30, 255, false);
-		echo "&nbsp;&nbsp;&nbsp;";
-		html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub search"');
-		echo "</form>";
-	echo "</td>";
-	echo "<td align=right>";
-		echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/tag/edit_tag&action=new">';
-		html_print_input_hidden ("create_tag", "1", true);
-		html_print_submit_button (__('Create tag'), 'create_button', false, 'class="sub next"');
-		echo "</form>";
-	echo "</td>";
-	echo "</tr>";
+		echo "<tr>";
+			echo "<td>";
+				echo '<b>' . __("Name") . "/" . __("Description") . '</b>';
+			echo "</td>";
+			echo "<td align=center>";
+				echo '<form method=post action="index.php?sec='.$sec.'&sec2=godmode/tag/tag&delete_tag=0">';
+				html_print_input_hidden ("search_tag", "1");
+				html_print_input_text ('tag_name', $tag_name, '', 30, 255, false);
+				echo "&nbsp;&nbsp;&nbsp;";
+				html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub search"');
+				echo "</form>";
+			echo "</td>";
+		echo "</tr>";
 	echo "</table>";
 }
 else {
@@ -247,18 +241,18 @@ if (!empty($result)) {
 	
 	html_print_table ($table);
 }
-if (defined("METACONSOLE")) {
-	echo "<table border=0 cellpadding=0 cellspacing=0 width=100%>";
-		echo "<tr>";
-			echo "<td align=right>";
-				echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/tag/edit_tag&action=new">';
-					html_print_input_hidden ("create_tag", "1", true);
-					html_print_submit_button (__('Create tag'), 'create_button', false, 'class="sub next"');
-				echo "</form>";
-			echo "</td>";
-		echo "</tr>";
-	echo "</table>";
-}
+
+echo "<table border=0 cellpadding=0 cellspacing=0 width=100%>";
+	echo "<tr>";
+		echo "<td align=right>";
+			echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/tag/edit_tag&action=new">';
+				html_print_input_hidden ("create_tag", "1", true);
+				html_print_submit_button (__('Create tag'), 'create_button', false, 'class="sub next"');
+			echo "</form>";
+		echo "</td>";
+	echo "</tr>";
+echo "</table>";
+
 
 enterprise_hook('close_meta_frame');
 
diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php
index f1995f1702..a3b7475146 100644
--- a/pandora_console/godmode/users/profile_list.php
+++ b/pandora_console/godmode/users/profile_list.php
@@ -289,8 +289,8 @@ if ($create_profile) {
 }
 
 $table = new stdClass();
-$table->cellpadding = 4;
-$table->cellspacing = 4;
+$table->cellpadding = 0;
+$table->cellspacing = 0;
 $table->class = 'databox data';
 $table->width = '100%';
 
@@ -327,7 +327,7 @@ $table->head['PM'] = "PM" . ui_print_help_tip (__('Systems management'), true);
 $table->head['operations'] = '<span title="Operations">' . __('Op.') . '</span>';
 
 $table->align = array_fill (1, 11, "center");
-$table->size = array_fill (1, 10, 40);
+$table->size = array_fill ("1%", "10%", "40%");
 
 $profiles = db_get_all_rows_in_table ("tperfil");
 if ($profiles === false) {
@@ -337,7 +337,7 @@ if ($profiles === false) {
 $img = html_print_image ("images/ok.png", true, array ("border" => 0));
 
 foreach ($profiles as $profile) {
-	$data['profiles'] = '<a href="index.php?sec=' . $sec . '&amp;sec2=godmode/users/configure_profile&id='.$profile["id_perfil"].'&pure='.$pure.'"><b>'.$profile["name"].'</b></a>';
+	$data['profiles'] = '<a href="index.php?sec=' . $sec . '&amp;sec2=godmode/users/configure_profile&id='.$profile["id_perfil"].'&pure='.$pure.'">'.$profile["name"].'</a>';
 	$data['IR'] = ($profile["incident_view"] ? $img : '');
 	$data['IW'] = ($profile["incident_edit"] ? $img : '');
 	$data['IM'] = ($profile["incident_management"] ? $img : '');
@@ -366,13 +366,14 @@ foreach ($profiles as $profile) {
 	array_push ($table->data, $data);
 }
 
-echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/users/configure_profile&pure='.$pure.'">';
 if (isset($data)) {
 	html_print_table ($table);
 }
 else {
 	echo "<div class='nf'>".__('There are no defined profiles')."</div>";
 }
+
+echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/users/configure_profile&pure='.$pure.'">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 html_print_input_hidden ('new_profile', 1);
 html_print_submit_button (__('Create'), "crt", false, 'class="sub next"');
diff --git a/pandora_console/images/calculator.png b/pandora_console/images/calculator.png
index 570b73a39d..525d724f30 100644
Binary files a/pandora_console/images/calculator.png and b/pandora_console/images/calculator.png differ
diff --git a/pandora_console/images/input_camera.png b/pandora_console/images/input_camera.png
new file mode 100644
index 0000000000..2e4323e82c
Binary files /dev/null and b/pandora_console/images/input_camera.png differ
diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
index 97c7191e7e..fc7a95a792 100644
--- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
+++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
@@ -51,7 +51,7 @@
 }
 
 .ui-front {
-	z-index: 100;
+	z-index: 10000;
 }
 
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 4033d5362d..c961bd944f 100755
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -775,7 +775,7 @@ input.pdf:disabled {
 	background-image: url(../../images/input_pdf.disabled.png) !important;
 }
 input.camera {
-	background-image: url(../../images/camera.png) !important;
+	background-image: url(../../images/input_camera.png) !important;
 }
 
 #toolbox #auto_save {
diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php
index 3dffe407d3..dcd08d2fce 100755
--- a/pandora_console/operation/incidents/incident.php
+++ b/pandora_console/operation/incidents/incident.php
@@ -215,7 +215,7 @@ echo '<table class="databox filters" cellpadding="4" cellspacing="4" width="100%
 <td valign="middle"><h3>'.__('Filter').'</h3>';
 
 $fields = incidents_get_status ();
-echo __("Incidents:") . '&nbsp;&nbsp;';
+echo "<b>" . __("Incidents:") . "</b>" . '&nbsp;&nbsp;';
  html_print_select ($fields, "estado", $estado, 'javascript:this.form.submit();', __('All incidents'), -1, false, false, false, 'w155');
 
 //Legend
@@ -238,12 +238,12 @@ echo '</td></tr><tr><td>';
 
 $fields = incidents_get_priorities ();
 
-echo __("Priorities:") . '&nbsp;&nbsp;';
+echo "<b>" . __("Priorities:") . "</b>" . '&nbsp;&nbsp;';
 html_print_select ($fields, "prioridad", $prioridad, 'javascript:this.form.submit();', __('All priorities'), -1,false,false,false,'w155');
 
 echo '</td></tr><tr><td>';
 
-echo __("Users:") . '&nbsp;&nbsp;';
+echo "<b>" . __("Users:") . "</b>" . '&nbsp;&nbsp;';
 html_print_select (users_get_info (), "usuario", $usuario, 'javascript:this.form.submit();', __('All users'), "", false, false, false, "w155");
 
 echo '</td></tr><tr><td>';
@@ -259,20 +259,20 @@ foreach ($agents_incidents as $agent_incident) {
 	$result_agent_incidents[$agent_incident['id_agente']] = $agent_incident['nombre'];
 }
 
-echo __("Agents:") . '&nbsp;&nbsp;';
+echo "<b>" . __("Agents:") .  "</b>" . '&nbsp;&nbsp;';
 html_print_select ($result_agent_incidents, "agent_search",
 	$agent_search, 'javascript:this.form.submit();', __('All agents'),
 	"", false, false, false, "w155");
 
 echo '</td></tr><tr><td colspan=3>';
 
-echo __("Groups:") . '&nbsp;&nbsp;';
+echo "<b>" . __("Groups:") . "</b>" . '&nbsp;&nbsp;';
 html_print_select_groups($config["id_user"], "IR", true, "grupo", $grupo, 'javascript:this.form.submit();', '', '',false,false,false,'w155');
 
 //echo "&nbsp;&nbsp;&nbsp;&nbsp;";
 echo '</td></tr><tr><td colspan=3>';
 
-echo __("Free text:") . '&nbsp;&nbsp;';
+echo "<b>" . __("Free text:") . "</b>" . '&nbsp;&nbsp;';
 html_print_input_text ('texto', $texto, '', 45);
 echo '&nbsp;';
 html_print_input_image ("submit", "images/zoom.png", __('Search'), 'padding:0;', false, array ("alt" => __('Search'))); 
@@ -281,7 +281,7 @@ echo "</td></tr></table>";
 echo '</form>';
 
 if ($count < 1) {
-	echo '<div class="nf">'.__('No incidents match your search filter').'</div><br />';
+	ui_print_info_message ( array('no_close'=>true, 'message'=>  __('No incidents match your search filter.') ) );
 }
 else {
 	// TOTAL incidents
@@ -377,10 +377,9 @@ else {
 	
 	echo '<form method="post" action="'.$url.'&amp;action=mass" style="margin-bottom: 0px;">';
 	html_print_table ($table);
-	echo '<div style="text-align:right; float:right; padding-right: 2px;">';
-	echo '<b>'.__('Action').': </b>' ;
+	echo '<div style="text-align:right; float:right;">';
 	if (check_acl ($config["id_user"], 0, "IW")) {
-		html_print_submit_button (__('Delete incidents'), 'delete_btn', false, 'class="sub delete"');
+		html_print_submit_button (__('Delete incidents'), 'delete_btn', false, 'class="sub delete" style="margin-right: 5px;"');
 	}
 	
 	if (check_acl ($config["id_user"], 0, "IM")) {
@@ -391,10 +390,8 @@ else {
 	unset ($table);
 }
 
-echo '<br><br>';
-
 if (check_acl ($config["id_user"], 0, "IW")) {
-	echo '<div style="text-align:right; float:right; padding-right: 2px;">';
+	echo '<div style="text-align:right; float:right; padding-right: 5px;">';
 	echo '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;insert_form=1">';
 	html_print_submit_button (__('Create incident'), 'crt', false, 'class="sub next"');
 	echo '</form>';
diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php
index b27daaa9a8..76de37d8c0 100755
--- a/pandora_console/operation/incidents/incident_detail.php
+++ b/pandora_console/operation/incidents/incident_detail.php
@@ -239,7 +239,7 @@ else {
 	echo '<form name="accion_form" method="POST" action="index.php?sec=workspace&sec2=operation/incidents/incident&action=insert">';
 }
 
-echo '<table cellpadding="4" cellspacing="4" class="databox" width="98%">';
+echo '<table cellpadding="4" cellspacing="4" class="databox filters" width="100%">';
 echo '<tr>
 		<td class="datos"><b>'.__('Incident').'</b></td>
 		<td colspan="3" class="datos">';
@@ -369,7 +369,7 @@ else {
 	html_print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;" disabled');
 }
 
-echo '</td></tr></table><div style="width: 98%; text-align:right;">';
+echo '</td></tr></table><div style="width: 100%; text-align:right;">';
 
 // Only if user is the used who opened incident or (s)he is admin
 if (isset ($id_inc) AND ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"]))) {
@@ -396,8 +396,10 @@ if (isset ($id_inc)) {
 	echo __('Add note');
 	echo '</a>';
 	echo '</div><div>';
-	echo '<form id="add_note" name="nota" method="POST" action="index.php?sec=workspace&sec2=operation/incidents/incident_detail&insertar_nota=1&id='.$id_inc.'"><h4>'.__('Add note').'</h4>';
-	echo '<table cellpadding="4" cellspacing="4" class="databox" width="98%">
+	echo '<form id="add_note" name="nota" method="POST" action="index.php?sec=workspace&sec2=operation/incidents/incident_detail&insertar_nota=1&id='.
+																	$id_inc.'"><h4>'.__('Add note').'</h4>';
+	
+	echo '<table cellpadding="4" cellspacing="4" class="databox" width="100%">
 		<tr><td class="datos2"><textarea name="nota" rows="5" cols="70" style="height: 100px;"></textarea></td>
 		<td valign="bottom"><input name="addnote" type="submit" class="sub wand" value="'.__('Add').'"></td></tr>
 		</table></form></div><div>';
diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php
index 093c971a1c..b4a4ceb104 100644
--- a/pandora_console/operation/messages/message_list.php
+++ b/pandora_console/operation/messages/message_list.php
@@ -90,7 +90,7 @@ else { //messages received
 }
 
 if (empty ($messages)) {
-	echo '<div class="nf">'.__('There are no messages').'</div>';
+	ui_print_info_message ( array('no_close'=>true, 'message'=>  __('There are no messages.') ) );
 }
 else {
 	$table = new stdClass();
@@ -196,22 +196,28 @@ else {
 		}
 		array_push ($table->data, $data);
 	}
-	if ($show_sent)
-		echo '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&show_sent=1&amp;multiple_delete=1">';
-	else
-		echo '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&amp;multiple_delete=1">';
-			html_print_table($table);
-			echo "<div style='text-align: right; width:" . $table->width . "'>";
-				html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
-			echo "</div>";
-	echo "</form>";
+	html_print_table($table);
 }
+echo "<table width='100%'>";
+	echo "<tr>";
+		echo "<td>";
+			echo "<div style='float: right;'>";
+				if (!empty($messages)){
+					if ($show_sent)
+						echo '<form method="post" style="float:right;" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&show_sent=1&amp;multiple_delete=1">';
+					else
+						echo '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&amp;multiple_delete=1">';
+								html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
+					echo "</form>";
+				}
+				echo '<form method="post" style="float:right;" action="index.php?sec=workspace&sec2=operation/messages/message_edit">';
+					html_print_submit_button (__('Create message'), 'create', false, 'class="sub next" style="margin-right:5px;"');
+				echo "</form>";
+			echo "</div>";
+		echo "</td>";
+	echo "</tr>";
+echo "</table>";
 
-echo '<form method="post" action="index.php?sec=workspace&sec2=operation/messages/message_edit">';
-echo '<div class="action-buttons" style="width: 100%; ">';
-html_print_submit_button (__('Create message'), 'create', false, 'class="sub next"');
-echo "</div>";
-echo "</form>";
 ?>
 
 <script type="text/javascript">