Some changes in layouts