diff --git a/CHANGELOG b/CHANGELOG
index 08a0fbd9..bc54d9de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+## 2.5.2
+
+- Web editor with tabs, thanks ilvalle
+
 ## 2.5.1
 
 - New style virtual fields in grid
diff --git a/VERSION b/VERSION
index 4d786e02..be51df03 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.5.1-stable+timestamp.2013.06.06.10.53.45
+Version 2.5.1-stable+timestamp.2013.06.07.17.35.00
diff --git a/applications/admin/views/default/edit_js.html b/applications/admin/views/default/edit_js.html
index 22d3db0a..6ed3c4bd 100644
--- a/applications/admin/views/default/edit_js.html
+++ b/applications/admin/views/default/edit_js.html
@@ -2,7 +2,7 @@
     return XML('<li><span class="teletype-text">%s</span><span>%s</span></li>' % (combo, description))
 }}
 
-<form action="{{=URL('edit', args=filename)}}" method="post" name="editform" id="editform" class="form-inline">
+<form action="{{=URL('edit', args=filename)}}" method="post" name="editform" id="editform" class="form-inline row-fluid">
 <div class="span12 well well-small">
 	<label class="">{{=T('Save file:')}}</label>
 	<a value="save" title="{{=T('Save file: %s', filename)}}" href="#" name="save" onclick="return doClickSave();" class="icon saveicon" style="background-image: -webkit-linear-gradient(top,white,#E6E6E6);">{{=IMG(_src=URL('static', 'images/save_icon.png'), _alt=T('Save'))}}</a>
diff --git a/gluon/dal.py b/gluon/dal.py
index c54d6d24..9b1b76cd 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -6991,10 +6991,11 @@ class Row(object):
                 key = col
                 res = record._extra[col]
             else:
-                key = f
                 if isinstance(record.get(t, None), Row):
+                    key = f
                     res = record[t][f]
                 else:
+                    key = f
                     res = record[f]
             if mode == 'object':
                 return (key, res)