fixed the layout + style