Some styling and wording changes