Essaye un nouveau style
Fix some bug and new design