Looking to clean up code and make sure visuals balance between flexibility and maintainability across the Hub.

Also, prepping for broader abstraction and reuse.