Layout fix

Refs #1933