diff --git a/typetapper/hierarchy_graph_view.py b/typetapper/hierarchy_graph_view.py
index 304c2ed..4f01d5f 100644
--- a/typetapper/hierarchy_graph_view.py
+++ b/typetapper/hierarchy_graph_view.py
@@ -586,6 +586,12 @@ class HierarchicalGraphWidget(QZoomableDraggableGraphicsView):
         old_group = self._old_group
         self._old_group = self.current_group.am_obj
         self._layouts[old_group] = {qnode.model: qnode.center for qnode in self.qnodes}
+        self.drop_target = None
+        self.end_expand()
+
+        for node in chain(self.ignore, self.faux_frontier):
+            self.hg.move_node(node, self.current_group.am_obj)
+
         self._layout(600)
         self._update_scene_rect(True)
         if focus is None:
@@ -750,7 +756,7 @@ class PropChart(QGraphicsItem):
         for item in list(self.childItems()):
             self.scene().removeItem(item)
 
-        data = [(offset, kind, size, count) for offset, v1 in self.prop.struct_data.items() for size, v2 in v1.items() for kind, count in v2.items()]
+        data = [(offset, kind, size, count) for offset, v1 in self.prop.struct_data.items() for size, v2 in v1.items() for kind, count in v2.items() if count]
         data.sort(key=lambda x: (x[0], x[1], -x[2], x[3]))
         cols_allocated = defaultdict(int)
         row_allocated = 0