Fix #1 layout issue