improve the layout and details