Some styling and content fixes