Layout fixes

Refs #1615