layout improvements (#546)

2 files changed