fixe and changes in the layout