Improve layout
Init data