Layout is nearly ended, commit for the modif asked by boss