Live Window Cleanup

Cleaned up the ungrouped objects in the live window.