diff --git a/port/roundbox.py b/port/roundbox.py
index 8ebc569..be5752c 100644
--- a/port/roundbox.py
+++ b/port/roundbox.py
@@ -1,80 +1,117 @@
+# Copyright 2014, Sugar Labs
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 import math
 
 from gi.repository import Gtk
 
 from sugar3.graphics import style
 
+_BORDER_DEFAULT = style.LINE_WIDTH
+
 
 class RoundBox(Gtk.HBox):
     __gtype_name__ = 'RoundBox'
 
-    _BORDER_DEFAULT = style.LINE_WIDTH
-
     def __init__(self, **kwargs):
         Gtk.HBox.__init__(self, **kwargs)
-
-        self._radius = style.zoom(10)
-        self.border = self._BORDER_DEFAULT
+        self._radius = style.zoom(15)
         self.border_color = style.COLOR_BLACK
+        self.tail = None
         self.background_color = None
-        self.connect("draw", self.__draw_cb)
-        self.connect("size-allocate", self.__size_allocate_cb)
-        self.connect("add", self.__add_cb)
+        self.set_resize_mode(Gtk.ResizeMode.PARENT)
+        self.set_reallocate_redraws(True)
+        self.connect('draw', self.__draw_cb)
+        self.connect('add', self.__add_cb)
 
     def __add_cb(self, child, params):
         child.set_border_width(style.zoom(5))
 
-    def __size_allocate_cb(self, widget, allocation):
-        self._x = allocation.x
-        self._y = allocation.y
-        self._width = allocation.width
-        self._height = allocation.height
-
     def __draw_cb(self, widget, cr):
-        x = self._x + self._BORDER_DEFAULT / 2
-        y = self._y + self._BORDER_DEFAULT / 2
-        width = self._width - self._BORDER_DEFAULT
-        height = self._height - self._BORDER_DEFAULT
+        rect = self.get_allocation()
+        hmargin = style.zoom(15)
+        x = hmargin
+        y = 0
+        width = rect.width - _BORDER_DEFAULT * 2. - hmargin * 2
+        if self.tail is None:
+            height = rect.height - _BORDER_DEFAULT * 2.
+        else:
+            height = rect.height - _BORDER_DEFAULT * 2. - self._radius
 
         cr.move_to(x + self._radius, y)
         cr.arc(x + width - self._radius, y + self._radius,
                self._radius, math.pi * 1.5, math.pi * 2)
-        cr.arc(x + width - self._radius, y + height - self._radius,
-               self._radius, 0, math.pi * 0.5)
-        cr.arc(x + self._radius, y + height - self._radius,
-               self._radius, math.pi * 0.5, math.pi)
+        tail_height = style.zoom(5)
+        if self.tail == 'right':
+            cr.arc(x + width - self._radius, y + height - self._radius * 2,
+                   self._radius, 0, math.pi * 0.5)
+            cr.line_to(x + width - self._radius, y + height)
+            cr.line_to(x + width - tail_height * self._radius,
+                       y + height - self._radius)
+            cr.arc(x + self._radius, y + height - self._radius * 2,
+                   self._radius, math.pi * 0.5, math.pi)
+        elif self.tail == 'left':
+            cr.arc(x + width - self._radius, y + height - self._radius * 2,
+                   self._radius, 0, math.pi * 0.5)
+            cr.line_to(x + self._radius * tail_height,
+                       y + height - self._radius)
+            cr.line_to(x + self._radius, y + height)
+            cr.line_to(x + self._radius, y + height - self._radius)
+            cr.arc(x + self._radius, y + height - self._radius * 2,
+                   self._radius, math.pi * 0.5, math.pi)
+        else:
+            cr.arc(x + width - self._radius, y + height - self._radius,
+                   self._radius, 0, math.pi * 0.5)
+            cr.arc(x + self._radius, y + height - self._radius,
+                   self._radius, math.pi * 0.5, math.pi)
         cr.arc(x + self._radius, y + self._radius, self._radius,
                math.pi, math.pi * 1.5)
         cr.close_path()
 
         if self.background_color is not None:
-            r, g, b, a = self.background_color.get_rgba()
+            r, g, b, __ = self.background_color.get_rgba()
             cr.set_source_rgb(r, g, b)
             cr.fill_preserve()
 
         if self.border_color is not None:
-            r, g, b, a = self.border_color.get_rgba()
+            r, g, b, __ = self.border_color.get_rgba()
             cr.set_source_rgb(r, g, b)
-            cr.set_line_width(self.border)
+            cr.set_line_width(_BORDER_DEFAULT)
             cr.stroke()
-        #cr.restore()
-            
+        return False
+
+
 if __name__ == '__main__':
 
     win = Gtk.Window()
     win.connect('destroy', Gtk.main_quit)
-    win.set_default_size(450, 550)
+    win.set_default_size(450, 450)
     vbox = Gtk.VBox()
 
     box1 = RoundBox()
+    box1.tail = 'right'
     vbox.add(box1)
-    label1 = Gtk.Label(label="Test 1")
+    label1 = Gtk.Label("Test 1")
     box1.add(label1)
 
     rbox = RoundBox()
+    rbox.tail = 'left'
     rbox.background_color = style.Color('#FF0000')
     vbox.add(rbox)
-    label2 = Gtk.Label(label="Test 2")
+    label2 = Gtk.Label("Test 2")
     rbox.add(label2)
 
     bbox = RoundBox()
@@ -82,6 +119,6 @@
     bbox.border_color = style.Color('#ff3300')
     vbox.add(bbox)
 
-    win.add(vbox)    
+    win.add(vbox)
     win.show_all()
     Gtk.main()