Some changes on layout.