Some changes in layout