Fixed a bit the layout