relayout & update

- better layout information