More changes to get layout right