Some styling fixes