Minor changes of the layout