Bundle groups structure & layout issues