Grosse màj du design, fix issue #7