diff --git a/shell/frame/RightPanel.py b/shell/frame/RightPanel.py
index 6807c379..18bf6d40 100644
--- a/shell/frame/RightPanel.py
+++ b/shell/frame/RightPanel.py
@@ -9,7 +9,7 @@ from sugar.presence import PresenceService
 
 class RightPanel(GridGroup):
 	def __init__(self, shell, friends):
-		GridGroup.__init__(self, 1, 14)
+		GridGroup.__init__(self, 1, 10)
 		self._shell = shell
 		self._friends = friends
 		self._activity_ps = None
diff --git a/shell/frame/TopPanel.py b/shell/frame/TopPanel.py
index 2c33519a..05fefd67 100644
--- a/shell/frame/TopPanel.py
+++ b/shell/frame/TopPanel.py
@@ -7,7 +7,7 @@ import sugar
 
 class TopPanel(GridGroup):
 	def __init__(self, shell):
-		GridGroup.__init__(self)
+		GridGroup.__init__(self, 16, 1)
 		self._shell = shell
 
 		self.add_zoom_level(sugar.ZOOM_ACTIVITY, 'stock-zoom-activity', 1)
diff --git a/sugar/canvas/GridLayout.py b/sugar/canvas/GridLayout.py
index cf863275..cfd4bb22 100644
--- a/sugar/canvas/GridLayout.py
+++ b/sugar/canvas/GridLayout.py
@@ -63,8 +63,8 @@ class GridLayout:
 	def layout_screen(self, screen):
 		for window in screen.get_windows():
 			[x, y, width, height] = self._get_geometry(screen, window)
-			window.move(x, y)
-			window.resize(width, height)
+			window.move(int(x), int(y))
+			window.resize(int(width), int(height))
 
 class GridGroup(goocanvas.Group):
 	__gproperties__ = {