More improvements to layout
2 files changed