Refonte du design + corrections