Some modifications in the layout