diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 2d4b970b8..8c2857e08 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -6061,15 +6061,22 @@ class SurveyAdminSettings {
 		
 		$prevstran = false;
 		
-		echo '<br />';
-		
 		echo '<fieldset><legend>'.$lang['srv_casi_po_vprasanjih_strani'].'</legend>';
-		echo '<table style="width:100%">';
-		echo '<tr><td></td><th>'.$lang['srv_bruto_v_cas'].'</th><th>'.$lang['srv_verjetnost_pojavitve'].'</th><th>'.$lang['srv_neto_v_cas'].'</th></tr>';
+		
+		echo '<table>';
+	
+		echo '<tr>';
+		echo '<th>'.$lang['srv_casi_po_straneh_stran'].'/'.$lang['srv_casi_po_vprasanjih_vprasanje'].'</th>';
+		echo '<th>'.$lang['srv_bruto_v_cas'].'</th>';
+		echo '<th>'.$lang['srv_verjetnost_pojavitve'].'</th>';
+		echo '<th>'.$lang['srv_neto_v_cas'].'</th>';
+		echo '<th colspan="2">'.$lang['srv_neto_v_cas'].'/'.$lang['srv_bruto_v_cas_long'].'</th>';
+		echo '</tr>';
+
 		foreach ($expected_vprasanja AS $vprasanje) {
 			
 			if (!$prevstran || $prevstran != $vprasanje[3]) {
-				echo '<tr><th style="text-align:left; border-bottom:1px solid #E4E4F9; padding-top:10px" colspan="5">'.$vprasanje[3].'</th></tr>';
+				echo '<tr><td class="bold" colspan="6">'.$vprasanje[3].'</td></tr>';
 				$prevstran = $vprasanje[3];
 			}
 			
@@ -6077,102 +6084,159 @@ class SurveyAdminSettings {
 			$verjetnost = $vprasanje[1];
 			$neto = $bruto * $verjetnost;
 			
-			echo '<tr><td align="left"><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td><td align="center">'.round($bruto, 1).'s</td><td align="center">'.round($verjetnost*100, 2).'%</td><td align="center">'.round($neto, 1).'s</td>';
-			echo '<td style="width:50%">';
-			echo '  <div class="graph_db" style="text-align: right; float: left; width: '.($neto/$max*85).'%">&nbsp;</div>';
-			if (($bruto-$neto)/$max*85 > 0)
-				echo '  <div class="graph_lb" style="border-left:0; text-align: right; float: left; width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>';
-			echo '  <span style="display: block; margin: auto auto auto 5px; float: left; color: gray">'.round($neto, 1).'s / '.round($bruto, 1).'s</span>';
+			echo '<tr>';
+			echo '<td><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td>';
+			echo '<td class="right">'.round($bruto, 1).'s</td>';
+			echo '<td class="center">'.round($verjetnost*100, 2).'%</td>';
+			echo '<td class="center">'.round($neto, 1).'s</td>';
+
+			echo '<td class="right time">';
+			echo round($neto, 1).'s / <span class="gray">'.round($bruto, 1).'s</span>';
 			echo '</td>';
+			
+			echo '<td class="graph_cell">';
+			echo '<div class="graph_cell">';
+
+			echo '<div class="graph_full" style="width: '.($neto/$max*85).'%">&nbsp;</div>';
+			if (($bruto-$neto)/$max*85 > 0)
+				echo '  <div class="graph_empty" style="width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>';
+			
+			echo '</div>';
+			echo '</td>';
+			
 			echo '</tr>';
 			
 		}
-		echo '<tr><th></th><th>'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</th><th></th><th>'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s</th><tr>';
+		echo '<tr class="bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="center">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s</td><td></td><td></td><tr>';
 		echo '</table>';
+
+		echo '<div class="tabela_trajanje_legenda">';
+		echo '<div class="graph_full legend"></div><span class="legend"> '.$lang['srv_neto_v_cas'].'</span>';
+		echo '<div class="graph_empty legend"></div><span class="legend"> '.$lang['srv_bruto_v_cas_long'].'</span>';
+		echo '</div>';
+
 		echo '</fieldset>';
                 
-                //CASI PO BLOKIH
-                if($block_spr_data){
-                    // izpis za bloke
-                    $maxb = 0;
-                    $totalb = 0;
-                    foreach ($expected_time_block AS $key => $val) {
-                            if ($val[1] > $maxb) $maxb = $val[1];
-                            $totalb += $val[0];
-                    }
-                
-                    echo '<br />';
-                    echo '<fieldset><legend>'.$lang['srv_casi_po_blokih'].'</legend>';
-                    echo '<table style="width:100%">';
+		//CASI PO BLOKIH
+		if($block_spr_data){
+			// izpis za bloke
+			$maxb = 0;
+			$totalb = 0;
+			foreach ($expected_time_block AS $key => $val) {
+					if ($val[1] > $maxb) $maxb = $val[1];
+					$totalb += $val[0];
+			}
+		
+			echo '<fieldset><legend>'.$lang['srv_casi_po_blokih'].'</legend>';
+			echo '<table>';
 
-                    foreach ($expected_time_block AS $vrstni_red => $time) {
-                            echo '<tr>';
-                            echo '<th style="text-align:left; padding: 0 20px 0 0" nowrap>'.$block_labels_by_number[$vrstni_red+1].'</th>';
+			echo '<tr>';
+			echo '<th>'.$lang['srv_casi_po_blokih_blok'].'</th>';
+			echo '<th colspan="2">'.$lang['srv_neto_t_cas'].' / '.$lang['srv_bruto_t_cas'].'</th>';
+			echo '</tr>';
 
-                            echo '<td style="width:100%">';
-                            echo '  <div class="graph_db" style="text-align: right; float: left; width: '.($time[0]/$maxb*85).'%">&nbsp;</div>';
-                            if ((($time[1]-$time[0])/$maxb*85) > 0)
-                                    echo '  <div class="graph_lb" style="border-left: 0; text-align: right; float: left; width: '.(($time[1]-$time[0])/$maxb*85).'%">&nbsp;</div>';
-                            echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'<span style="color:gray">/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span></span>';
-                            echo '</td>';
+			foreach ($expected_time_block AS $vrstni_red => $time) {
+					echo '<tr>';
+					echo '<td class="nowrap">'.$block_labels_by_number[$vrstni_red+1].'</td>';
 
-                            echo '</tr>';
-                    }
-                    echo '<tr><td colspan="3" style="border-bottom:1px solid #E4E4F9"></td></tr>';
-                    echo '<tr><td></td><th style="text-align:left; padding-right: 20px" nowrap>'.$lang['srv_anl_suma1'].': '.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s</th></tr>';
+					echo '<td class="right time">';
+					echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'<span class="gray">/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
+					echo '</td>';
 
-                    echo '</table>';
+					echo '<td class="graph_cell">';
+					echo '<div class="graph_cell">';
+					echo '  <div class="graph_full" style="width: '.($time[0]/$maxb*85).'%">&nbsp;</div>';
+					if ((($time[1]-$time[0])/$maxb*85) > 0)
+							echo '  <div class="graph_empty" style="width: '.(($time[1]-$time[0])/$maxb*85).'%">&nbsp;</div>';
+					echo '</div>';
+					echo '</td>';
 
-                    echo '<p><div class="graph_db" style="float: left; width: 11px">&nbsp;</div><span style="float:left; margin:0 10px 0 5px"> - '.$lang['srv_neto_t_cas'].'</span>';
-                    echo '<div class="graph_lb" style="float: left; width: 11px">&nbsp;</div><span style="float:left; margin:0 10px 0 5px"> - '.$lang['srv_bruto_t_cas'].'</span></p>';
+					echo '</tr>';
+			}
+			echo '<tr class="bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="nowrap">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s</td></tr>';
 
-                    echo '</fieldset>';
-                
-                
-                    // izpis za vprasanja po blokih
-                    $max = 0;
-                    $bruto_total = 0;
-                    $neto_total = 0;
-                    foreach ($expected_vprasanja AS $vpr) {
-                        if($vpr[4]){
-                            if ($vpr[0] > $max) $max = $vpr[0];
-                            $bruto_total += $vpr[0];
-                            $neto_total += $vpr[0] * $vpr[1];
-                        }
-                    }
+			echo '</table>';
 
-                    $prevstran = false;
+			echo '<div class="tabela_trajanje_legenda">';
+			echo '<div class="graph_full legend"></div><span class="legend"> '.$lang['srv_neto_t_cas'].'</span>';
+			echo '<div class="graph_empty legend"></div><span class="legend"> '.$lang['srv_bruto_t_cas'].'</span>';
+			echo '</div>';
 
-                    echo '<br />';
+			echo '</fieldset>';
+		
+		
+			// izpis za vprasanja po blokih
+			$max = 0;
+			$bruto_total = 0;
+			$neto_total = 0;
+			foreach ($expected_vprasanja AS $vpr) {
+				if($vpr[4]){
+					if ($vpr[0] > $max) $max = $vpr[0];
+					$bruto_total += $vpr[0];
+					$neto_total += $vpr[0] * $vpr[1];
+				}
+			}
 
-                    echo '<fieldset><legend>'.$lang['srv_casi_po_vprasanjih_bloki'].'</legend>';
-                    echo '<table style="width:100%">';
-                    echo '<tr><td></td><th>'.$lang['srv_bruto_v_cas'].'</th><th>'.$lang['srv_verjetnost_pojavitve'].'</th><th>'.$lang['srv_neto_v_cas'].'</th></tr>';
-                    foreach ($expected_vprasanja AS $vprasanje) {
-                        if($vprasanje[4]){
-                            if (!$prevstran || $prevstran != $vprasanje[4]) {
-                                    echo '<tr><th style="text-align:left; border-bottom:1px solid #E4E4F9; padding-top:10px" colspan="5">'.$vprasanje[4].'</th></tr>';
-                                    $prevstran = $vprasanje[4];
-                            }
+			$prevstran = false;
 
-                            $bruto = $vprasanje[0];
-                            $verjetnost = $vprasanje[1];
-                            $neto = $bruto * $verjetnost;
+			echo '<fieldset><legend>'.$lang['srv_casi_po_vprasanjih_bloki'].'</legend>';
 
-                            echo '<tr><td align="left"><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td><td align="center">'.round($bruto, 1).'s</td><td align="center">'.round($verjetnost*100, 2).'%</td><td align="center">'.round($neto, 1).'s</td>';
-                            echo '<td style="width:50%">';
-                            echo '  <div class="graph_db" style="text-align: right; float: left; width: '.($neto/$max*85).'%">&nbsp;</div>';
-                            if (($bruto-$neto)/$max*85 > 0)
-                                    echo '  <div class="graph_lb" style="border-left:0; text-align: right; float: left; width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>';
-                            echo '  <span style="display: block; margin: auto auto auto 5px; float: left; color: gray">'.round($neto, 1).'s / '.round($bruto, 1).'s</span>';
-                            echo '</td>';
-                            echo '</tr>';
-                        }
-                    }
-                    echo '<tr><th></th><th>'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</th><th></th><th>'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s</th><tr>';
-                    echo '</table>';
-                    echo '</fieldset>';
-                }
+			echo '<table>';
+
+			echo '<tr>';
+			echo '<th>'.$lang['srv_casi_po_straneh_stran'].'/'.$lang['srv_casi_po_vprasanjih_vprasanje'].'</th>';
+			echo '<th>'.$lang['srv_bruto_v_cas'].'</th>';
+			echo '<th>'.$lang['srv_verjetnost_pojavitve'].'</th>';
+			echo '<th>'.$lang['srv_neto_v_cas'].'</th>';
+			echo '<th colspan="2">'.$lang['srv_neto_v_cas'].'/'.$lang['srv_bruto_v_cas_long'].'</th>';
+			echo '</tr>';
+
+			foreach ($expected_vprasanja AS $vprasanje) {
+				
+				if($vprasanje[4]){
+					if (!$prevstran || $prevstran != $vprasanje[4]) {
+							echo '<tr><th style="text-align:left; border-bottom:1px solid #E4E4F9; padding-top:10px" colspan="5">'.$vprasanje[4].'</th></tr>';
+							$prevstran = $vprasanje[4];
+					}
+				
+					$bruto = $vprasanje[0];
+					$verjetnost = $vprasanje[1];
+					$neto = $bruto * $verjetnost;
+					
+					echo '<tr>';
+					echo '<td><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td>';
+					echo '<td class="right">'.round($bruto, 1).'s</td>';
+					echo '<td class="center">'.round($verjetnost*100, 2).'%</td>';
+					echo '<td class="center">'.round($neto, 1).'s</td>';
+
+					echo '<td class="right time">';
+					echo round($neto, 1).'s / <span class="gray">'.round($bruto, 1).'s</span>';
+					echo '</td>';
+					
+					echo '<td class="graph_cell">';
+					echo '<div class="graph_cell">';
+
+					echo '<div class="graph_full" style="width: '.($neto/$max*85).'%">&nbsp;</div>';
+					if (($bruto-$neto)/$max*85 > 0)
+						echo '  <div class="graph_empty" style="width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>';
+					
+					echo '</div>';
+					echo '</td>';
+					
+					echo '</tr>';
+				}
+				
+			}
+			echo '<tr class="bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="center">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s</td><td></td><td></td><tr>';
+			echo '</table>';
+
+			echo '<div class="tabela_trajanje_legenda">';
+			echo '<div class="graph_full legend"></div><span class="legend"> '.$lang['srv_neto_v_cas'].'</span>';
+			echo '<div class="graph_empty legend"></div><span class="legend"> '.$lang['srv_bruto_v_cas_long'].'</span>';
+			echo '</div>';
+
+			echo '</fieldset>';
+		}
 	}
         
         /**
diff --git a/lang/1.php b/lang/1.php
index a099af6af..0541d402c 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3960,6 +3960,7 @@ $lang = array (
 	"srv_bruto_cas"						=>	"Bruto &#269;as",
 	"srv_neto_cas"						=>	"Neto &#269;as",
 	"srv_bruto_v_cas"					=>	"Brez pogojev",
+	"srv_bruto_v_cas_long"				=>	"Trajanje brez pogojev",
 	"srv_neto_v_cas"					=>	"Dejansko trajanje",
 	"srv_bruto_t_cas"					=>	"Trajanje z upoštevanjem vseh vprašanj (brez pogojev)",
 	"srv_neto_t_cas"					=>	"Dejansko trajanje",
@@ -4001,6 +4002,9 @@ $lang = array (
 	"srv_casi_po_straneh"				=>	"Časi po straneh",
 	"srv_casi_po_straneh_stran"			=>	"Stran",
 	"srv_casi_po_blokih"				=>	"Časi po blokih",
+	"srv_casi_po_blokih_blok"			=>	"Blok",
+	"srv_casi_po_vprasanjih_vprasanje"	=>	"Vprašanje",
+	"srv_casi_po_vprasanjih_skupaj"		=>	"Skupaj",
 	"srv_casi_po_vprasanjih_strani"		=>	"Časi po vprašanjih (Strani)",
 	"srv_casi_po_vprasanjih_bloki"		=>	"Časi po vprašanjih (Bloki)",
 	"srv_frekvencna_porazdelitev"		=>	"Frekven&#269;na porazdelitev trajanja",
diff --git a/lang/2.php b/lang/2.php
index 29d937408..d253b0114 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3945,6 +3945,7 @@ $lang = array (
 	"srv_bruto_cas"						=>	"Gross time",
 	"srv_neto_cas"						=>	"Net time",
 	"srv_bruto_v_cas"					=>	"Without conditions",
+	"srv_bruto_v_cas_long"				=>	"Duration without conditions",
 	"srv_neto_v_cas"					=>	"Actual duration",
 	"srv_bruto_t_cas"					=>	"Duration considering all questions (without conditions)",
 	"srv_neto_t_cas"					=>	"Actual duration",
@@ -3985,9 +3986,12 @@ $lang = array (
 	"srv_dejansko_trajanje"				=>	"Estimated actual duration of survey",
 	"srv_casi_po_straneh"				=>	"Times by pages",
 	"srv_casi_po_straneh_stran"			=>	"Page",
+	"srv_casi_po_vprasanjih_vprasanje"	=>	"Question",
+	"srv_casi_po_vprasanjih_skupaj"		=>	"Total",
 	"srv_casi_po_blokih"				=>	"Times by blocks",
 	"srv_casi_po_vprasanjih_strani"		=>	"Times by questions (Pages)",
 	"srv_casi_po_vprasanjih_bloki"		=>	"Times by questions (Blocks)",
+	"srv_casi_po_blokih_blok"			=>	"Block",
 	"srv_frekvencna_porazdelitev"		=>	"Frequency distribution",
 	"srv_dejanski_casi"					=>	"Actual duration of survey",
 	"srv_testni_nagovor"					=>	"Expected number of answers per question. Test data are distributed evenly for questions with several answer categories. <br /><br />A random 4-digit variable is generated for numeric questions and random text with 10 characters is generated for text questions.",