Redid the layout