More changes to the layout