Changed slightly the layout