remove some useless divs and update the style with margins