Added some styling and styling/semantic markup changes