Additional tweaks for Bundle view