diff --git a/indefero/src/IDF/templates/idf/base.html b/indefero/src/IDF/templates/idf/base.html
index d4ec247..c907cd2 100644
--- a/indefero/src/IDF/templates/idf/base.html
+++ b/indefero/src/IDF/templates/idf/base.html
@@ -82,6 +82,7 @@
       <h1 class="title" id="title">{block titleicon}{/block}{block title}{$page_title}{/block}</h1>
 <br/>
   </div>
+
   <div id="bd">
     <div id="yui-main">
       <div class="yui-b">
@@ -208,6 +209,34 @@ $(function() {
 
 
     });
+    function lineWrap(){
+        var wrap = function () {
+            var elems = document.getElementsByClassName('syntaxhighlighter');
+            for (var j = 0; j < elems.length; ++j) {
+                var sh = elems[j];
+                var gLines = sh.getElementsByClassName('gutter')[0].getElementsByClassName('line');
+                var cLines = sh.getElementsByClassName('code')[0].getElementsByClassName('line');
+                var stand = 15;
+                for (var i = 0; i < gLines.length; ++i) {
+                    var h = $(cLines[i]).height();
+                    if (h != stand) {
+                        console.log(i);
+                        gLines[i].setAttribute('style', 'height: ' + h + 'px !important;');
+                    }
+                }
+            }
+        };
+        var whenReady = function () {
+            if ($('.syntaxhighlighter').length === 0) {
+                setTimeout(whenReady, 800);
+            } else {
+                wrap();
+            }
+        };
+        whenReady();
+    };
+    lineWrap();
+    $(window).resize(function(){lineWrap()});
 
     {/literal}
 </script>
diff --git a/pluf/src/Pluf/HTTP/URL.php b/pluf/src/Pluf/HTTP/URL.php
index bed8138..12591f2 100644
--- a/pluf/src/Pluf/HTTP/URL.php
+++ b/pluf/src/Pluf/HTTP/URL.php
@@ -62,8 +62,8 @@ class Pluf_HTTP_URL
         if (isset($_GET['_pluf_action'])) {
             return $_GET['_pluf_action'];
         }
-        return (isset($_SERVER['PATH_INFO'])) ?
-            $_SERVER['PATH_INFO'] : '/';
+        return (isset($_SERVER['REDIRECT_URL'])) ?
+            $_SERVER['REDIRECT_URL'] : '/';
     }
 }
 
diff --git a/pluf/src/Pluf/Translation.php b/pluf/src/Pluf/Translation.php
index 7ce37de..055740d 100644
--- a/pluf/src/Pluf/Translation.php
+++ b/pluf/src/Pluf/Translation.php
@@ -70,7 +70,7 @@ class Pluf_Translation
 
     public static function getLocale()
     {
-        return $GLOBALS['_PX_current_locale'];
+        return (isset($GLOBALS['_PX_current_locale'])) ? $GLOBALS['_PX_current_locale'] : "en";
     }
 
     /**