Index: oup/current/Tools/RawEdit.dfm
===================================================================
--- oup/current/Tools/RawEdit.dfm	(revision 69)
+++ oup/current/Tools/RawEdit.dfm	(revision 70)
@@ -138,10 +138,9 @@
       Height = 114
       Align = alClient
-      ColCount = 1
+      ColCount = 2
       DefaultColWidth = 80
       DefaultRowHeight = 18
       FixedCols = 0
       RowCount = 8
-      FixedRows = 0
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
Index: oup/current/Tools/RawEdit.pas
===================================================================
--- oup/current/Tools/RawEdit.pas	(revision 69)
+++ oup/current/Tools/RawEdit.pas	(revision 70)
@@ -385,8 +385,9 @@
   fileid     := -1;
 
+{
   value_viewer.ColCount := 2;
   value_viewer.RowCount := 8;
   value_viewer.FixedRows := 1;
-
+}
   value_viewer.Cells[0, 0] := 'Type';
   value_viewer.Cells[1, 0] := 'Value';
@@ -457,5 +458,6 @@
 procedure TForm_RawEdit.panel_contentResize(Sender: TObject);
 begin
-//  value_viewer.ColWidths[1] := value_viewer.Width - value_viewer.ColWidths[0] - 28;
+  if fileid >= 0 then
+    value_viewer.ColWidths[1] := value_viewer.Width - value_viewer.ColWidths[0] - 50;
 end;
 
Index: oup/current/Tools/Template.pas
===================================================================
--- oup/current/Tools/Template.pas	(revision 69)
+++ oup/current/Tools/Template.pas	(revision 70)
@@ -368,5 +368,9 @@
 procedure TForm_ToolTemplate.FormActivate(Sender: TObject);
 begin
-  edit_filtername.SetFocus;
+  if edit_filtername.CanFocus then
+    edit_filtername.SetFocus
+  else
+    if content.CanFocus then
+      content.SetFocus;
 end;