Improve the layout

You could