Further refined the layout.