Merge pull request #355 from cpoulain/master

More incremental improvements to worksheet view.