Layout improvement

Closes #1933