diff --git a/modeltranslation/static/modeltranslation/css/tabbed_translation_fields.css b/modeltranslation/static/modeltranslation/css/tabbed_translation_fields.css
index d0279c4..4014fd9 100644
--- a/modeltranslation/static/modeltranslation/css/tabbed_translation_fields.css
+++ b/modeltranslation/static/modeltranslation/css/tabbed_translation_fields.css
@@ -54,13 +54,29 @@
     font-size: 12px;
 }
 
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a{
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
     background: #7CA0C7 repeat-x;
     color: #fff;
     padding: 6px 10px 4px 10px;
     margin-top: 0;
 }
 
-.ui-tabs .ui-tabs-panel{
+.ui-tabs .ui-tabs-panel {
     padding: 0;
 }
+
+.inline-group .tabular .ui-tabs .ui-tabs-panel {
+    padding: 5px;
+}
+.inline-group .tabular .ui-tabs .ui-tabs-nav {
+    padding-left: 4px;
+    font-family: "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Verdana,Arial, sans-serif;
+}
+.inline-group .tabular tr td input,
+.inline-group .tabular tr td textarea {
+    margin-top: 3.4em;
+}
+.inline-group .tabular tr td.ui-tabs input,
+.inline-group .tabular tr td.ui-tabs textarea {
+    margin-top: 0;
+}
diff --git a/modeltranslation/static/modeltranslation/js/tabbed_translation_fields.js b/modeltranslation/static/modeltranslation/js/tabbed_translation_fields.js
index 3ca4c6e..3c87e25 100644
--- a/modeltranslation/static/modeltranslation/js/tabbed_translation_fields.js
+++ b/modeltranslation/static/modeltranslation/js/tabbed_translation_fields.js
@@ -46,7 +46,7 @@ var google, django, gettext;
                  *  'id_news-data2-content_type-object_id-0-1-name_zh_cn': id_news-data2-content_type-object_id-0-1-name'
                  */
                 // TODO: We should be able to simplify this, the modeltranslation specific
-                // field ids are already build to be easily splitable, so we could use them
+                // field classes are already build to be easily splitable, so we could use them
                 // to slice off the language code.
                 var idBits = this.id.split('-'),
                     idPrefix = 'id_' + this.origFieldname;
@@ -297,10 +297,6 @@ var google, django, gettext;
                     }
                     panel = $('<div id="' + tabId + '"></div>').append(container);
 
-                    // TODO: Fix visual glitch when there are translation fields and
-                    // non-translation fields in the same row. Non-translation fields align top
-                    // which makes them appear in line with the tabs navigation.
-                    /*
                     // Turn the moved tds into divs
                     var attrs = {};
                     $.each($(container)[0].attributes, function(idx, attr) {
@@ -309,7 +305,6 @@ var google, django, gettext;
                     $(container).replaceWith(function () {
                         return $('<div />', attrs).append($(this).contents());
                     });
-                    */
 
                     // TODO: Setting the required state based on the default field is to naive.
                     // The user might have tweaked his admin. We somehow have to keep track of the