Some changes with the layout