Fixed a few beauty things for presentation