Some styling and markup changes