Some changes in layout, not final.