Some progress on issue #65, but some layout problems remain to be resolved