Layout fixes for issue #106.