ref #8011 Layout improvements