Improve bb10 layout.