More layout adjustments for issue #780