Improvment of the layout