bugid-99421 Render modules in Hubs - Fixes after design review