Layout

Minor modifications of the layout