Re-doing the layout