Merge pull request #353 from cpoulain/master

Next round of improvements for bundle display in worksheet.