diff --git a/src/application/ljv.application.version.pas b/src/application/ljv.application.version.pas
index 527a3c0..167028a 100644
--- a/src/application/ljv.application.version.pas
+++ b/src/application/ljv.application.version.pas
@@ -29,11 +29,11 @@
 interface
 
 const
-  cVersion = '0.1.9.36';
+  cVersion = '0.1.9.37';
   cVersionMajor = 0;
   cVersionMinor = 1;
   cVersionRevision = 9;
-  cVersionBuild = 36;
+  cVersionBuild = 37;
 
 implementation
 
diff --git a/src/forms/ljv.forms.main.lfm b/src/forms/ljv.forms.main.lfm
index d60d89a..06d853b 100644
--- a/src/forms/ljv.forms.main.lfm
+++ b/src/forms/ljv.forms.main.lfm
@@ -11,6 +11,7 @@ object frmMain: TfrmMain
   OnDestroy = FormDestroy
   OnDropFiles = FormDropFiles
   SessionProperties = 'Top;Left;Height;Width;WindowState'
+  LCLVersion = '2.1.0.0'
   object lbFiles: TListBox
     Left = 0
     Height = 528
@@ -61,7 +62,7 @@ object frmMain: TfrmMain
     TabPosition = tpBottom
     object tsTree: TTabSheet
       Caption = '&Tree'
-      ClientHeight = 497
+      ClientHeight = 494
       ClientWidth = 787
       object psMain: TPairSplitter
         Cursor = crDefault
@@ -90,7 +91,7 @@ object frmMain: TfrmMain
             Header.Columns = <            
               item
                 Position = 0
-                Width = 398
+                Width = 400
               end>
             Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs]
             TabOrder = 0
@@ -163,7 +164,7 @@ object frmMain: TfrmMain
     end
     object tsJSON: TTabSheet
       Caption = '&JSON'
-      ClientHeight = 497
+      ClientHeight = 494
       ClientWidth = 787
       inline SynEdit: TSynEdit
         Left = 0
diff --git a/src/forms/ljv.forms.main.pas b/src/forms/ljv.forms.main.pas
index ab13a04..5961368 100644
--- a/src/forms/ljv.forms.main.pas
+++ b/src/forms/ljv.forms.main.pas
@@ -40,9 +40,14 @@ interface
 , PairSplitter
 , JSONPropStorage
 , ActnList
-, StdActns, ComCtrls, SynEdit, SynHighlighterJScript
+, StdActns
+, ComCtrls
+, SynEdit
+, SynHighlighterJScript
 , fpjson
 , VirtualTrees
+//, DefaultTranslator
+, LCLTranslator
 ;
 
 type
@@ -97,6 +102,7 @@   TfrmMain = class(TForm)
     procedure ClosePropStorage;
 
     procedure ClearLabels;
+    procedure ClearValuePanel;
     procedure CorrectPairSplitterCursor;
     procedure ProcessParams;
     procedure UpdateFileList;
@@ -236,8 +242,6 @@ procedure TfrmMain.FormDropFiles(Sender: TObject;
 end;
 
 procedure TfrmMain.lbFilesSelectionChange(Sender: TObject; User: boolean);
-var
-  index: Integer;
 begin
   if User then
   begin
@@ -247,13 +251,7 @@ procedure TfrmMain.lbFilesSelectionChange(Sender: TObject; User: boolean);
   begin
     Caption:= Format(rsFormCaptionFile, [FFileList[lbFiles.ItemIndex], cVersion]);
     ClearLabels;
-    for index:=0 to pred(panValue.ComponentCount) do
-    begin
-      if Assigned(panValue.Components[index]) then
-      begin
-        panValue.Components[index].Free;
-      end;
-    end;
+    ClearValuePanel;
     LoadFile(FFileList[lbFiles.ItemIndex]);
     UpdateTree;
   end;
@@ -534,6 +532,14 @@ procedure TfrmMain.SetupShortcuts;
 {$ENDIF}
 end;
 
+procedure TfrmMain.ClearValuePanel;
+begin
+  while panValue.ComponentCount > 0 do
+  begin
+    panValue.Components[0].Free;
+  end;
+end;
+
 function TfrmMain.FormatBytes(ABytes: Int64): String;
 var
   dSize: Double;
diff --git a/src/lazJSONViewer.lpi b/src/lazJSONViewer.lpi
index e5d01ba..e192c25 100644
--- a/src/lazJSONViewer.lpi
+++ b/src/lazJSONViewer.lpi
@@ -26,7 +26,7 @@
       <UseVersionInfo Value="True"/>
       <MinorVersionNr Value="1"/>
       <RevisionNr Value="9"/>
-      <BuildNr Value="36"/>
+      <BuildNr Value="37"/>
       <Language Value="0809"/>
     </VersionInfo>
     <BuildModes Count="3">