Layout improvements for issue #1323