update the layout and refined the design