Fix and Improve style

Widths, alignement, ...