diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index c79f802fa1..46fb18ca81 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -285,67 +285,35 @@ $remove_with_tag_disabled = empty($tag_with_temp);
 $add_without_tag_disabled = empty($tags_select_without);
 $remove_without_tag_disabled = empty($tag_without_temp);
 
+$table->colspan[13][0] = '2';
+$table->data[13][0] = '<b>' . __('Events with following tags') . '</b>';
+$table->data[14][0] = html_print_select ($tags_select_with, 'select_with',
+	'', '', '', 0, true, false, true, '', false, 'width: 220px;');
+$table->data[14][1] = html_print_button(__('Add'), 'add_whith', $add_with_tag_disabled,
+	'', 'class="add sub"', true);
 
-if (defined("METACONSOLE")) {
-	
-	$table->data[13][0] = '<b>' . __('Events with following tags') . '</b>';
-	$table->data[13][0] .= '<br>' . html_print_select ($tags_select_with, 'select_with',
-		'', '', '', 0, true, false, true, '', false, 'width: 120px;');
-	$table->data[13][0] .= '&nbsp;' . html_print_button(__('Add'), 'add_whith', $add_with_tag_disabled,
-		'', 'class="add sub"', true);
-	$table->data[13][0] .= '<br>' . html_print_select ($tag_with_temp,
-		'tag_with_temp', array(), '', '', 0, true, true,
-		true, '', false, "width: 120px; height: 50px;");
-	$table->data[13][0] .= '&nbsp;' . html_print_button(__('Remove'),
-		'remove_whith', $remove_with_tag_disabled, '', 'class="delete sub"', true);
-	$table->data[13][0] .= html_print_input_hidden('tag_with',
-		$tag_with_base64, true);
+$table->data[15][0] = html_print_select ($tag_with_temp,
+	'tag_with_temp', array(), '', '', 0, true, true,
+	true, '', false, "width: 220px; height: 50px;");
+$table->data[15][0] .= html_print_input_hidden('tag_with',
+	$tag_with_base64, true);
+$table->data[15][1] = html_print_button(__('Remove'),
+	'remove_whith', $remove_with_tag_disabled, '', 'class="delete sub"', true);
 
-	$table->data[13][1] = '<b>' . __('Events without following tags') . '</b>';
-	$table->data[13][1] .= '<br>' . html_print_select ($tags_select_without, 'select_without',
-		'', '', '', 0, true, false, true, '', false, 'width: 120px;');
-	$table->data[13][1] .= '&nbsp;' . html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled,
-		'', 'class="add sub"', true);
-	$table->data[13][1] .= '<br>' . html_print_select ($tag_without_temp,
-		'tag_without_temp', array(), '', '', 0, true, true,
-		true, '', false, "width: 120px; height: 50px;");
-	$table->data[13][1] .= '&nbsp;' . html_print_button(__('Remove'), 'remove_whithout', $remove_without_tag_disabled,
-		'', 'class="delete sub"', true);
-	$table->data[13][1] .= html_print_input_hidden('tag_without',
-		$tag_without_base64, true);
-}
-else {
-	
-	$table->colspan[13][0] = '2';
-	$table->data[13][0] = '<b>' . __('Events with following tags') . '</b>';
-	$table->data[14][0] = html_print_select ($tags_select_with, 'select_with',
-		'', '', '', 0, true, false, true, '', false, 'width: 120px;');
-	$table->data[14][1] = html_print_button(__('Add'), 'add_whith', $add_with_tag_disabled,
-		'', 'class="add sub"', true);
+$table->colspan[16][0] = '2';
+$table->data[16][0] = '<b>' . __('Events without following tags') . '</b>';
+$table->data[17][0] = html_print_select ($tags_select_without, 'select_without',
+	'', '', '', 0, true, false, true, '', false, 'width: 220px;');
+$table->data[17][1] = html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled,
+	'', 'class="add sub"', true);
 
-	$table->data[15][0] = html_print_select ($tag_with_temp,
-		'tag_with_temp', array(), '', '', 0, true, true,
-		true, '', false, "width: 120px; height: 50px;");
-	$table->data[15][0] .= html_print_input_hidden('tag_with',
-		$tag_with_base64, true);
-	$table->data[15][1] = html_print_button(__('Remove'),
-		'remove_whith', $remove_with_tag_disabled, '', 'class="delete sub"', true);
-
-	$table->colspan[16][0] = '2';
-	$table->data[16][0] = '<b>' . __('Events without following tags') . '</b>';
-	$table->data[17][0] = html_print_select ($tags_select_without, 'select_without',
-		'', '', '', 0, true, false, true, '', false, 'width: 120px;');
-	$table->data[17][1] = html_print_button(__('Add'), 'add_whithout', $add_without_tag_disabled,
-		'', 'class="add sub"', true);
-
-	$table->data[18][0] = html_print_select ($tag_without_temp,
-		'tag_without_temp', array(), '', '', 0, true, true,
-		true, '', false, "width: 120px; height: 50px;");
-	$table->data[18][0] .= html_print_input_hidden('tag_without',
-		$tag_without_base64, true);
-	$table->data[18][1] = html_print_button(__('Remove'), 'remove_whithout', $remove_without_tag_disabled,
-		'', 'class="delete sub"', true);
-}
+$table->data[18][0] = html_print_select ($tag_without_temp,
+	'tag_without_temp', array(), '', '', 0, true, true,
+	true, '', false, "width: 220px; height: 50px;");
+$table->data[18][0] .= html_print_input_hidden('tag_without',
+	$tag_without_base64, true);
+$table->data[18][1] = html_print_button(__('Remove'), 'remove_whithout', $remove_without_tag_disabled,
+	'', 'class="delete sub"', true);
 
 $table->data[19][0] = '<b>' . __('Alert events') . '</b>';
 $table->data[19][1] = html_print_select(
diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index c51430519b..821a564e4e 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -60,8 +60,6 @@ $table->width = '100%';
 $table->class = 'databox filters';
 
 if(defined('METACONSOLE')) {
-	$table->width = '100%';
-	$table->class = 'databox data';
 	$table->head[0] = __('Edit event responses');
 	$table->head_colspan[0] = 5;
 	$table->headstyle[0] = 'text-align: center';
@@ -132,7 +130,7 @@ if ($event_response_id == 0) {
 	if(!defined('METACONSOLE'))
 		echo '<div style="width:100%;text-align:right;">';
 	else
-		echo '<br><br><div style="width:100%;text-align:right;">';
+		echo '<div style="width:100%;text-align:right;">';
 	html_print_submit_button(__('Create'), 'create_response_button', false, array('class' => 'sub next'));
 	echo '</div>';
 	echo '</form>';
@@ -143,7 +141,7 @@ else {
 	if(!defined('METACONSOLE'))
 		echo '<div style="width:100%;text-align:right;">';
 	else
-		echo '<br><br><div style="width:100%;text-align:right;">';
+		echo '<div style="width:100%;text-align:right;">';
 	html_print_submit_button(__('Update'), 'update_response_button', false, array('class' => 'sub next'));
 	echo '</div>';
 	echo '</form>';
diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index 9c7bb691dc..0eb7d52b0f 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.php
@@ -239,7 +239,7 @@ else {
 
 
 echo '<form method="post">';
-echo '<div class="" style="float:right">';
+echo '<div class="" style="float:right;">';
 html_print_input_hidden ('new', 1);
 html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"');
 echo '</div>';
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 25560a5e5b..839967706e 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -279,7 +279,7 @@ if ($maps) {
 	if (!defined('METACONSOLE'))
 		echo '<div class="action-buttons" style="width: 0px;">';
 	else
-		echo '<div class="action-buttons" style="width: 500px; text-align: right;">';
+		echo '<div class="" style="width: 100%; text-align: right;">';
 }
 if ($maps) {
 	if ($vconsoles_write || $vconsoles_manage) {
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 1a76e21597..ead3ea29d5 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -92,7 +92,7 @@ function show_save_filter_dialog() {
 						opacity: 0.5,
 						background: "black"
 					},
-					width: 420,
+					width: 688,
 					height: 200
 				})
 				.show ();
@@ -109,8 +109,8 @@ function show_load_filter_dialog() {
 						opacity: 0.5,
 						background: "black"
 					},
-					width: 420,
-					height: 200
+					width: 520,
+					height: 300
 				})
 				.show ();
 	return false;