Got rid of hierarchy hell

Cleaned up the hierarchy and created 2 new text bubbles