Some changes to layout