Re-designed the layout