changed a bit the layout and positions