improved a bit the layout