Some styling improvements