Some changes to the layout