Customize markup and clean up typography