Some little changes in the layout