Some changes to layout
Some changes to layout