Layout improvements

Refs #1933