Clean up in hierarchy and GUI changes