diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index bc6305176d..edac545400 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-08 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* mobile/operation/modules.php, mobile/include/style/main.css:
+	yes another fixes.
+	
+	MERGED FROM BRANCH 4.0
+
 2013-07-08 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* mobile/operation/alerts.php, mobile/operation/events.php,
diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index f79e03bd20..3882f49777 100644
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -598,7 +598,8 @@ table#list_events th {
 */
 	}
 	
-	#list_Modules_Embedded .cell_2 {
+	#list_Modules_Embedded .cell_2,
+	#list_Modules_Embedded .cell_4 {
 		display: none !important;
 	}
 	
@@ -610,7 +611,8 @@ table#list_events th {
 	}
 }
 
-#list_Modules_Embedded .cell_4 a {
+#list_Modules_Embedded .cell_4 a,
+#list_Modules_Embedded .cell_1 a {
 	color: #000000 !important;
 }
 /*
@@ -677,6 +679,10 @@ ul.ui-listview li.ui-btn div.ui-btn-inner div.ui-btn-text {
 	padding-left: 5px;
 }
 
+li.ui-btn {
+	margin-bottom: 4px !important;
+	margin-top: 4px !important;
+}
 
 
 /*INIT---------Fix the tons of air between the rows in small table----*/
diff --git a/pandora_console/mobile/operation/modules.php b/pandora_console/mobile/operation/modules.php
index c1a298066a..df804b02d2 100644
--- a/pandora_console/mobile/operation/modules.php
+++ b/pandora_console/mobile/operation/modules.php
@@ -541,14 +541,26 @@ class Modules {
 			}
 		}
 		else {
-			$table = new Table();
-			$table->id = 'list_Modules';
-			$table->importFromHash($listModules['modules']);
 			if (!$return) {
+				$table = new Table();
+				$table->id = 'list_Modules';
+				$table->importFromHash($listModules['modules']);
+				
 				$ui->contentAddHtml($table->getHTML());
 			}
 			else {
+				foreach ($listModules['modules'] as $key => $module) {
+					$listModules['modules'][$key][__('Status')] .=
+						'<span style="display: none;" class="show_collapside">' .
+						$listModules['modules'][$key][__('Data')] . 
+						'</span>';
+				}
+				
+				$table = new Table();
 				$table->id = 'list_Modules_Embedded';
+				
+				$table->importFromHash($listModules['modules']);
+				
 				$html = $table->getHTML();
 				
 				return $html;