Updated Templates to reflect proper placement in bundles