Layout fixing

- some diagnostic messages
- scrolling fixed