Changed styling and presentation a bit...