=== modified file 'src/ui/dialog/text-edit.cpp'
--- src/ui/dialog/text-edit.cpp	2016-12-27 14:38:57 +0000
+++ src/ui/dialog/text-edit.cpp	2017-02-28 02:09:11 +0000
@@ -96,15 +96,17 @@
     layout_hbox.pack_start(align_sep, false, false, 10);
 
     /* Direction buttons */
+    /* FIXME: Commented out as there are more options now on the text tool controls bar
     styleButton(&text_horizontal, _("Horizontal text"), INKSCAPE_ICON("format-text-direction-horizontal"), NULL);
     styleButton(&text_vertical, _("Vertical text"), INKSCAPE_ICON("format-text-direction-vertical"), &text_horizontal);
 
     text_sep.set_orientation(Gtk::ORIENTATION_VERTICAL);
 
     layout_hbox.pack_start(text_sep, false, false, 10);
+    */
 
     /* Line Spacing */
-    /* Commented out as this does not handle non-percentage values
+    /* FIXME: Commented out as this does not handle non-percentage values
     GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("text_line_spacing") );
     layout_hbox.pack_start(*Gtk::manage(Glib::wrap(px)), false, false);
 
@@ -119,9 +121,11 @@
     gtk_widget_set_tooltip_text (px, _("Spacing between baselines (percent of font size)"));
     gtk_widget_set_tooltip_text (spacing_combo, _("Spacing between baselines (percent of font size)"));
     layout_hbox.pack_start(*Gtk::manage(Glib::wrap(spacing_combo)), false, false);
+    */
+
+    // add layout_hbox (with align and direction style buttons, spacing_combo, startOffset)
     layout_frame.set_padding(4,4,4,4);
     layout_frame.add(layout_hbox);
-    */
 
     // Text start Offset
     {
@@ -134,13 +138,14 @@
         }
         gtk_entry_set_text(reinterpret_cast<GtkEntry *>(gtk_bin_get_child(reinterpret_cast<GtkBin *>(startOffset))), "0%");
 
+        // TODO: add label for startOffset in case there's sufficient space in hbox
         gtk_widget_set_tooltip_text(startOffset, _("Text path offset"));
 
+        layout_hbox.pack_end(*Gtk::manage(Glib::wrap(startOffset)), false, false);
+
         auto sep = Gtk::manage(new Gtk::Separator());
         sep->set_orientation(Gtk::ORIENTATION_VERTICAL);
-        layout_hbox.pack_start(*sep, false, false, 10);
-
-        layout_hbox.pack_start(*Gtk::manage(Glib::wrap(startOffset)), false, false);
+        layout_hbox.pack_end(*sep, false, false, 10);
     }
 
     /* Font preview */