Reducing React Tree Depth

Refactor component compositions to simplify the tree structure.