-// Prepare data for the template
-define('__TOTAL_TABS' , $DATA['total_tabs']);
-define('__TOTAL_SIZE' , TRANSLATE_COMMA($DATA['total_size']));
-define('__TOTAL_CALLS' , $DATA['total_rows']);
-define('__TOTAL_OPTIMIZED', TRANSLATE_COMMA($DATA['total_opti']));
-define('__NOW_OPTIMIZED' , $gain_tabs);
-define('__NOW_SAVED' , TRANSLATE_COMMA($DATA['total_gain']));
+// Remember rows
+$content['rows'] = $OUT;
+
+// Transfer data to $content for template
+$content = merge_array($content, $DATA);
+$content['now_optimized'] = $gain_tabs;