Some styling improved