Fix layout
Add more informations