fixing markup and text