Fixed a bunch of bugs with nesting components.