More changes in layout