refactored bundle rendering