issue #808, #772: Worksheet and AR layout fixes