minor changes of the layout