New layout

Changed the layout again