Layout fix

Closes #1537